From cc84a001b8b71d457f30e5520c1583bbd297d691 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 14 May 2014 21:05:35 +0200 Subject: build system: re-enable clang use Change-Id: I6e07fdec449d0b259d77986f65a60aa36d367cc8 Signed-off-by: Patrick Georgi Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5747 Tested-by: build bot (Jenkins) --- Makefile | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cc2d27ce7f..195bfe69dc 100644 --- a/Makefile +++ b/Makefile @@ -107,13 +107,31 @@ else include $(HAVE_DOTCONFIG) -include toolchain.inc - ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -CC:=clang -m32 -mno-mmx -mno-sse -no-integrated-as +# FIXME: armv7/aarch64 won't build right now +CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-elf -m32 +CC_x86_32:=clang + +ifneq ($(CONFIG_MMX),y) +CFLAGS_x86_32 += -mno-mmx +endif + +# FIXME: we end up with conflicting flags with this, not clear on this part. +#ifneq ($(CONFIG_SSE),y) +#CFLAGS_x86_32 += -mno-sse +#endif + +CFLAGS_armv7 = -no-integrated-as -Qunused-arguments -target armv7-eabi -ccc-gcc-name $(CC_armv7) +CC_armv7:=clang + +CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) +CC_aarch64:=clang + HOSTCC:=clang endif +include toolchain.inc + strip_quotes = $(subst ",,$(subst \",,$(1))) # The primary target needs to be here before we include the -- cgit v1.2.3