From f0a2670862ae589c6a2745fa618a2a70f40e5397 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 1 Oct 2013 04:26:08 -0700 Subject: [PATCH] Makefile: Include ccopts variables in the static.c Make rules. There are special rules which build the static.c files because they come from $(obj) and not $(src) like most source files, and its apparently the most straightforward way to fold them into the build. Those special copies of the rules didn't have the $(class)-c-ccopts variables in them, though, so that one file for each class would be compiled with different flags. This change adds that variable in so the special version of the rules match the normal version. BUG=chrome-os-partner:23009 TEST=Built for pit, snow, nyan, link, and falco. BRANCH=None Change-Id: Ie637118d433a0a43a6a9d2c8b9ecb92155044546 Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/171339 Reviewed-by: Gabe Black Reviewed-by: Stefan Reinauer Commit-Queue: Gabe Black Tested-by: Gabe Black --- Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 7e0b44c5ca..49a39d7b5e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -297,11 +297,11 @@ $(objutil)/%.o: $(objutil)/%.c $(obj)/%.ramstage.o $(abspath $(obj))/%.ramstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -MMD $(CFLAGS) -c -o $@ $< + $(CC) -MMD $(CFLAGS) $(ramstage-c-ccopts) -c -o $@ $< $(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -MMD -D__PRE_RAM__ $(CFLAGS) -c -o $@ $< + $(CC) -MMD $(CFLAGS) $(romstage-c-ccopts) -c -o $@ $< $(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) @printf " CC $(subst $(obj)/,,$(@))\n"