summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Hoogenboom <hoogenboom30@zonnet.nl>2009-04-02 23:08:16 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-02 23:08:16 +0000
commite729846b64eed59e72080766d09036ebbe9760a7 (patch)
treef29109e8cd13b3f37c5f6a22e8e944ef3ec3ee83
parent5cbdc1ee6f37a45c3cda62a797e81572001dc7b7 (diff)
Ronald Hoogenboom writes:
I've attached a patch that removes the 3-mile-long compiler commandlines, which vim's quickfix doesn't like so much. Instead of putting all those -DXYZ='bla' on the compiler commandline, they are put in a file called settings.h (as #define XYZ bla) and only a --include=settings.h is put on the commandline. This file is created unconditionally at the same time as when the CPUFLAGS simply expanded make variable used to be created (not via a target rule and dependency), so it shouldn't change anything. Signed-off-by: Ronald Hoogenboom <hoogenboom30@zonnet.nl> Acked-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4047 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/newconfig/config.g4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 91c5bad4d2..eddff03092 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -2049,9 +2049,9 @@ def writeimagemakefile(image):
file.write("# Get the value of TOP, VARIABLES, and several other variables.\n")
file.write("include Makefile.settings\n\n")
file.write("# Function to create an item like -Di586 or -DCONFIG_MAX_CPUS='1' or -Ui686\n")
- file.write("D_item = $(if $(subst undefined,,$(origin $1)),-D$1$(if $($1),='$($1)',),-U$1)\n\n")
+ file.write("D_item = $(shell echo '$(if $(subst undefined,,$(origin $1)),\\#define $1$(if $($1), $($1),),\\#undef $1)' >> settings.h)\n\n")
file.write("# Compute the value of CPUFLAGS here during make's first pass.\n")
- file.write("CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))\n\n")
+ file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))--include=settings.h)\n\n")
for i in image.getuserdefines():
file.write("%s\n" %i)