From 822cc7ed2ad29eafeb51b75ee106e000f8a11ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20M=C3=A1rton?= Date: Tue, 27 Jul 2021 14:29:16 +0200 Subject: ni845x_spi: handle PROGRAMFILES(X86) env var properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PROGRAMFILES(X86) envvar contains brackets which could not be interpreted by the Makefile's interpreter. A sed based tweak have been added to extract the variable value from the env command output. The prefixed include and linker path with this (now correctly extracted) prefix only added to the compilation flags if it differ from the PROGRAMFILES variable. Change-Id: I397619a5038567d649a417ce6b9d8ac9e1c8c67b Signed-off-by: Miklós Márton Reviewed-on: https://review.coreboot.org/c/flashrom/+/56636 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Nico Huber --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a021267e..27f66a99 100644 --- a/Makefile +++ b/Makefile @@ -744,9 +744,18 @@ ifeq ($(CONFIG_NI845X_LIBRARY_PATH),) # if the user did not specified the NI-845x headers/lib path # do a guess for both 32 and 64 bit Windows versions NI845X_LIBS += -L'${PROGRAMFILES}\National Instruments\NI-845x\MS Visual C' -NI845X_LIBS += -L'${PROGRAMFILES(x86)}\National Instruments\NI-845x\MS Visual C' NI845X_INCLUDES += -I'${PROGRAMFILES}\National Instruments\NI-845x\MS Visual C' -NI845X_INCLUDES += -I'${PROGRAMFILES(x86)}\National Instruments\NI-845x\MS Visual C' + +# hack to access env variable containing brackets... +PROGRAMFILES_X86DIR = $(shell env | sed -n "s/^PROGRAMFILES(X86)=//p") + +ifneq ($(PROGRAMFILES_X86DIR),) +ifneq ($(PROGRAMFILES_X86DIR), ${PROGRAMFILES}) +NI845X_LIBS += -L'$(PROGRAMFILES_X86DIR)\National Instruments\NI-845x\MS Visual C' +NI845X_INCLUDES += -I'$(PROGRAMFILES_X86DIR)\National Instruments\NI-845x\MS Visual C' +endif +endif + else NI845X_LIBS += -L'$(CONFIG_NI845X_LIBRARY_PATH)' NI845X_INCLUDES += -I'$(CONFIG_NI845X_LIBRARY_PATH)' -- cgit v1.2.3