| author | Nathan Chancellor <natechancellor@gmail.com> | 2019-04-17 17:52:26 (GMT) |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-04-18 18:27:19 (GMT) |
| commit | 5d68df32998cd6e900ccc6d0b1a0c9d45125506f (patch) | |
| tree | c20dd866679a42677dcd10bb9f078d60fae7687b | |
| parent | 50db17e52bb890e0dcaf7ab64a201b93a4555e91 (diff) | |
| download | common-5d68df32998cd6e900ccc6d0b1a0c9d45125506f.zip common-5d68df32998cd6e900ccc6d0b1a0c9d45125506f.tar.gz common-5d68df32998cd6e900ccc6d0b1a0c9d45125506f.tar.bz2 | |
ANDROID: Makefile: Properly resolve 4.9.169 merge
The merge removed commit 4dcb0afde6f4 ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").
This keeps commit 1347aa2a4d9a ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.
Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -507,7 +507,11 @@ endif ifeq ($(cc-name),clang) ifneq ($(CROSS_COMPILE),) -CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) +CLANG_TRIPLE ?= $(CROSS_COMPILE) +CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%)) +ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y) +$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?") +endif GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit)) CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) |