summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Roth <martin@se-eng.com>2012-12-14 12:42:28 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2012-12-14 22:21:10 +0100
commit9aaf7d17bbb8140ad9091d2435bdffa0d241fb56 (patch)
treeb70f4d162cc2df1aed184eff7c7c81265e90f4f5
parentbb71c91db18ce60a6589ff563c1a23d8dd1e7e7f (diff)
downloadcoreboot-9aaf7d17bbb8140ad9091d2435bdffa0d241fb56.tar.gz
coreboot-9aaf7d17bbb8140ad9091d2435bdffa0d241fb56.tar.bz2
coreboot-9aaf7d17bbb8140ad9091d2435bdffa0d241fb56.zip
Fix broken scan-build
Adding support for the multiple architectures broke the scan-build option. The new CC setting needed to be wrapped and not run again when doing the scan-build second pass. Change-Id: Ieb418f51d44803308040926a4154fb5fdc3ba67f Signed-off-by: Martin Roth <martin@se-eng.com> Reviewed-on: http://review.coreboot.org/2031 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3c537a51c191..527fbcc96a17 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,9 @@ ARCH-y := $(ARCHDIR-y)
ARCH-$(CONFIG_ARCH_ARMV7) := armv7
ARCH-$(CONFIG_ARCH_X86) := i386
+ifneq ($(INNER_SCANBUILD),y)
CC := $(CC_$(ARCH-y))
+endif
AS := $(AS_$(ARCH-y))
LD := $(LD_$(ARCH-y))
NM := $(NM_$(ARCH-y))