sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scan-build prefers -include over --includes=, gcc knows both.

Browse Source 
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
This commit is contained in:
Patrick Georgi
2009-04-21 12:41:55 +00:00
parent 7bd658873c
commit 5cda45d5ec
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/newconfig/config.g
View File

@@ -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)

8
util/romcc/romcc.c
View File

@@ -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;
}
}