diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-21 12:41:55 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-21 12:41:55 +0000 |
| commit | 5cda45d5ec2dc2b112cb7ec1a95b861f1fa9fd2b (patch) | |
| tree | 59210b61518a9c8e71e65e2bddbce1d99ad8d026 | |
| parent | 7bd658873c5b4066b4f247255cb7a98ba1750cd1 (diff) | |
| download | coreboot-staging-5cda45d5ec2dc2b112cb7ec1a95b861f1fa9fd2b.zip coreboot-staging-5cda45d5ec2dc2b112cb7ec1a95b861f1fa9fd2b.tar.gz | |
scan-build prefers -include over --includes=, gcc knows both.
With this change, romcc knows -include and the build system uses it.
Also use a full path to settings.h because scan-build has trouble
finding it otherwise.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Joseph Smith <joe@settoplinux.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4151 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | util/newconfig/config.g | 2 | ||||
| -rw-r--r-- | util/romcc/romcc.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 69b3b64..a8130c8 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -2098,7 +2098,7 @@ def writeimagemakefile(image): file.write("# Function to create an item like -Di586 or -DCONFIG_MAX_CPUS='1' or -Ui686\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 := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))--include=settings.h)\n\n") + file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))-include $(PWD)/settings.h)\n\n") for i in image.getuserdefines(): file.write("%s\n" %i) diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c index 0fc83a1..bc647fd 100644 --- a/util/romcc/romcc.c +++ b/util/romcc/romcc.c @@ -25118,11 +25118,13 @@ int main(int argc, char **argv) else if (strncmp(argv[1], "-m", 2) == 0) { result = arch_encode_flag(&arch, argv[1]+2); } - else if (strncmp(argv[1], "--include=", 10) == 0) { + else if (strncmp(argv[1], "-include", 10) == 0) { if (includefile) { - arg_error("Only one --include option may be specified.\n"); + arg_error("Only one -include option may be specified.\n"); } else { - includefile = argv[1] + 10; + argv++; + argc--; + includefile = argv[1]; result = 0; } } |
