summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2018-11-09 10:26:38 -0800
committerAlistair Strachan <astrachan@google.com>2018-11-29 13:20:33 -0800
commite3d1cdc82d3f2cc248e4a49d43b526731a01054f (patch)
treeafe48d7205bda7eb97f360e07d28416ce85e9709
parentbc1cf2226ce5ff1e93560e0220a2ecaccc2b196b (diff)
Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple"
This reverts commit f0907aa15ed9f9c7541bb244ed3f52c376ced19c. 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>
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6b0e7d0c984d..a6139c7923ec 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)/..)