From faf51f000e70f067b51f5f2957ddb12764ffd98f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 16 Jan 2012 17:13:28 -0500 Subject: buildsys: fix handling of CFLAG_-W{a,l} vars Need a little indirection/delayed evaluation to handle variables with equal signs and commas in them. Reported-by: Khem Raj Signed-off-by: Mike Frysinger --- Rules.mak | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Rules.mak b/Rules.mak index 032193e6b..a84584f40 100644 --- a/Rules.mak +++ b/Rules.mak @@ -197,7 +197,8 @@ endef # as well CFLAG_-Wa (for invoking the compiler driver). define check-as-var $(call check-tool-var,check_as,ASFLAG,$(1)) -export CFLAG_-Wa$(1) = $$(if $$(ASFLAG_$(1)),-Wa$(comma)$$(ASFLAG_$(1))) +_v = CFLAG_-Wa$(1) +export $(_v) = $$(if $$(ASFLAG_$(1)),-Wa$$(comma)$$(ASFLAG_$(1))) endef # Usage: check-ld-var, # Check the linker to see if it supports . Export the @@ -205,7 +206,8 @@ endef # as well CFLAG_-Wl (for invoking the compiler driver). define check-ld-var $(call check-tool-var,check_ld,LDFLAG,$(1)) -export CFLAG_-Wl$(1) = $$(if $$(LDFLAG_$(1)),-Wl$(comma)$$(LDFLAG_$(1))) +_v = CFLAG_-Wl$(1) +export $$(_v) = $$(if $$(LDFLAG_$(1)),-Wl$$(comma)$$(LDFLAG_$(1))) endef # Usage: cache-output-var,, # Execute and cache the output in . -- cgit v1.2.3