summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2018-11-09 10:26:38 -0800
committerAmit Pundir <amit.pundir@linaro.org>2018-12-11 00:17:30 +0530
commit6e1e07976aa235ac2a94b88b2335bf0cf049048d (patch)
treed8447941bc61e83b9da81ca2839df3230d75e886 /Makefile
parent3e104c78b1da5bffcbd0cf8865bfd2d7e26bd796 (diff)
Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple"
This reverts commit d97498d6a546d928cc60c03979aaba67a6ddacb5. We will apply a better version backported from experimental/android-4.19. Bug: 118442619 Change-Id: I8e2be21dd6b4ce659d60cb871438d022adb680e1 Signed-off-by: Alistair Strachan <astrachan@google.com> [AmitP: Updated commit message for correct SHA1 hash] Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a0df14c5a4d4..fa0ddebdbb88 100644
--- a/Makefile
+++ b/Makefile
@@ -611,8 +611,7 @@ all: vmlinux
ifeq ($(cc-name),clang)
ifneq ($(CROSS_COMPILE),)
-CLANG_TRIPLE ?= $(CROSS_COMPILE)
-CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
+CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR)
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)