build: properly unquote CONFIG_CFLAGS and CONFIG_LDFLAGS

cmarcelo · cmarcelo · commit d97adb17b2ec · 2015-08-28T09:40:44.000-03:00
When using CONFIG_CFLAGS containing spaces, it would be appended to the
command line keeping the quotes. The issue is that `patsusbt` operates
on words, but not assuming quotes mean anything.

    $(patsubst "%",%,$(CONFIG_CFLAGS))

was evaluating

    "-Wno-undef
    -Wno-missing-include-dirs"

and neither matched.

Using two patsubst, one for "% and another for %" works in some cases
but would break in the case we had quotes inside one of the flags.

This patch uses `echo`, and ensures that it is called only once for each
flag by creating the UNQUOTED_ variables using `:=` (single assignment).

Signed-off-by: Caio Marcelo de Oliveira Filho &lt;caio.oliveira@intel.com&gt;
diff --git a/tools/build/Makefile.vars b/tools/build/Makefile.vars
@@ -161,8 +161,11 @@ COMMON_LDFLAGS += $(SANITIZE_ADDRESS_LDFLAGS)
 endif
 endif
 
-COMMON_CFLAGS += $(patsubst "%",%,$(CONFIG_CFLAGS))
-COMMON_LDFLAGS += $(patsubst "%",%,$(CONFIG_LDFLAGS))
+UNQUOTED_CONFIG_CFLAGS := $(shell echo $(CONFIG_CFLAGS))
+UNQUOTED_CONFIG_LDFLAGS := $(shell echo $(CONFIG_LDFLAGS))
+
+COMMON_CFLAGS += $(UNQUOTED_CONFIG_CFLAGS)
+COMMON_LDFLAGS += $(UNQUOTED_CONFIG_LDFLAGS)
 
 ifneq (,$(shell echo $(COMMON_CFLAGS) | grep -e "-O[s12345\ ]"))
 COMMON_CFLAGS += $(FLTO_CFLAGS)
