From 5f4dc25899070ea45e2a718b40edeb44dcc81ef9 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 19 Apr 2017 17:36:32 -0500 Subject: [PATCH] UPSTREAM: Makefile.inc: ensure cbfs-files-processor-struct has correct ccopts The ramstage-c-ccopts variable needs to be double dereferenced for the cbfs-files-processor-struct handler so all the ccopts are included since the ramstage-c-ccopts is fully constructed later by another function. Without this not all the flags are present on the command line. BUG=none BRANCH=none TEST=none Change-Id: Ic3d0b9f7ddf2cd0d3b542bd35a2d7e209a77c364 Signed-off-by: Patrick Georgi Original-Commit-Id: 42bcd13c758c3b72c46e8d7aeabddb4c37a1657e Original-Change-Id: I5425b3c1f23d767c61f654dd287584403f85d719 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://review.coreboot.org/19380 Original-Reviewed-by: Julius Werner Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Furquan Shaikh Original-Tested-by: build bot (Jenkins) Reviewed-on: https://chromium-review.googlesource.com/488045 --- Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 56eb4b941b..98f6af6e35 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -288,7 +288,7 @@ cbfs-files-processor-defconfig= \ cbfs-files-processor-struct= \ $(eval $(2): $(1) $(obj)/build.h $(KCONFIG_AUTOHEADER); \ printf " CC+STRIP $(@)\n"; \ - $(CC_ramstage) -MMD $(CPPFLAGS_ramstage) $(CFLAGS_ramstage) $(ramstage-c-ccopts) -include $(KCONFIG_AUTOHEADER) -MT $(2) -o $(2).tmp -c $(1) && \ + $(CC_ramstage) -MMD $(CPPFLAGS_ramstage) $(CFLAGS_ramstage) $$(ramstage-c-ccopts) -include $(KCONFIG_AUTOHEADER) -MT $(2) -o $(2).tmp -c $(1) && \ $(OBJCOPY_ramstage) -O binary $(2).tmp $(2); \ rm -f $(2).tmp) \ $(eval DEPENDENCIES += $(2).d)