From 1850aa6df6a324960bd0873277660d84562cdb61 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 3 Sep 2017 23:42:58 +0200 Subject: toolchain: Always use GCC for Ada sources We can't use $(CC) in case it's set to Clang. TEST=Built one target with Ada sources before and after this change and verified that the same compiler commands are emitted. Change-Id: I9b8ea35352d74b364f09fc12d8d981ca42f8b7c8 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/21366 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- toolchain.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toolchain.inc') diff --git a/toolchain.inc b/toolchain.inc index 936eb14c7f..f8ee87578e 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -120,6 +120,7 @@ define create_class_compiler $(if $(2),,$(warning *** The toolchain architecture for $(1) is unknown.) \ $(error Check your .config file for CONFIG_ARCH_$(1)_* settings)) CC_$(1) := $(CC_$(2)) +GCC_$(1) := $(GCC_CC_$(2)) LD_$(1) := $(LD_$(2)) NM_$(1) := $(NM_$(2)) AR_$(1) := $(AR_$(2)) @@ -129,7 +130,7 @@ OBJDUMP_$(1) := $(OBJDUMP_$(2)) STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) -ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(CFLAGS_$(2)) +ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(GCC_CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -D__ARCH_$(2)__ COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) -- cgit v1.2.3