aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-05-08 19:53:01 +0930
committerStewart Smith <stewart@linux.ibm.com>2018-05-09 10:17:42 -0500
commit09c19b98781e1c297c146b0daefa593bcfb0ea33 (patch)
tree2f812451efd2e9fe76d9065da9fd8d800563f716
parenta565a2837a60c5546e55999e32a88f844f46e860 (diff)
downloadskiboot-09c19b98781e1c297c146b0daefa593bcfb0ea33.zip
skiboot-09c19b98781e1c297c146b0daefa593bcfb0ea33.tar.gz
skiboot-09c19b98781e1c297c146b0daefa593bcfb0ea33.tar.bz2
Makefile: be precise about clang target
While CROSS can be set to a ppc64le toolchian, we don't want to build for that target. Hardcode the target to powerpc64-linux-gnu. Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--Makefile.main11
1 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.main b/Makefile.main
index 92dd92b..6e0e4be 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -146,24 +146,15 @@ AFLAGS += $(call try-cflag,$(CC),-mabi=elfv1)
endif
ifeq ($(cc-name),clang)
-ifneq ($(CROSS),)
-CLANG_TARGET := --target=$(notdir $(CROSS:%-=%))
+CLANG_TARGET := --target=powerpc64-linux-gnu -mcpu=pwr8
GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..)
-endif
ifneq ($(GCC_TOOLCHAIN),)
CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
endif
CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
-CFLAGS += $(call cc-option, -no-integrated-as)
-AFLAGS += $(call cc-option, -no-integrated-as)
-
LDFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
-CFLAGS += -mcpu=pwr8
-LDFLAGS += -mcpu=pwr8
-ASFLAGS += -mcpu=pwr8
-
# Workarounds
# TODO: Fix the issues these hide, and remove them
CFLAGS += -Wno-cast-align \