aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain.inc
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@se-eng.com>2014-11-06 15:50:22 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-11-09 01:36:43 +0100
commita38ccfdee1404211dbf3c43edf7b5b686a3a05fd (patch)
treea162c0b5c8a6c6fc7272f8e966039861ca54f1cd /toolchain.inc
parent430363ace7338b9708feefb5917d667f1733944d (diff)
downloadcoreboot-a38ccfdee1404211dbf3c43edf7b5b686a3a05fd.tar.gz
coreboot-a38ccfdee1404211dbf3c43edf7b5b686a3a05fd.tar.xz
coreboot-a38ccfdee1404211dbf3c43edf7b5b686a3a05fd.zip
build: Add ccopts back into the build
The ccopts mechanism is needed for passing ARM assembler flags to GCC. There are many gotchas in adding ASFLAGS. As things have moved around, the revert doesn't remove cleanly, so this reverts and cleans up the ccopts. This reverts commit 25b56c3af514faa8a730d56fe14cae4960ac83aa. Change-Id: I44c025535258e6afb05a814123c10c24775a88e8 Signed-off-by: Marc Jones <marc.jones@se-eng.com> Reviewed-on: http://review.coreboot.org/7352 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'toolchain.inc')
-rw-r--r--toolchain.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain.inc b/toolchain.inc
index 1f95b6b2d..0ed370f49 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -90,8 +90,8 @@ OBJCOPY_$(1) := $(OBJCOPY_$(2))
OBJDUMP_$(1) := $(OBJDUMP_$(2))
STRIP_$(1) := $(STRIP_$(2))
READELF_$(1) := $(READELF_$(2))
-CFLAGS_$(1) += $$(CFLAGS_common) $$(CFLAGS_$(2))
-CPPFLAGS_$(1) += $$(CPPFLAGS_common) $$(CPPFLAGS_$(2))
+CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2))
+CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2))
LIBGCC_FILE_NAME_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name))
LIBCLANG_RT_FILE_NAME_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null)
endef