malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: Fix 4.14.93 resolution

Browse Source 
Commit ff858d822074 ("kbuild: consolidate Clang compiler flags")
conflicts with commit 9ff6ab2fbc00 ("ANDROID: Kbuild, LLVMLinux: allow
overriding clang target triple"). As it currently stands, CLANG_FLAGS
will not have the proper target parameter when cross compiling for
aarch64-linux-android. Move the CLANG_FLAGS definition up and use it
when checking for the proper target fallback, allowing us to properly
remove CLANG_TARGET.

Change-Id: I176146ad613bd5e6187f3421f29c2ffcc9ceebc3
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
This commit is contained in:
Nathan Chancellor 2019-01-14 17:24:18 -07:00
parent 8fccd8d9d5
commit 3aa15d6782
No known key found for this signature in database
GPG Key ID: 99739260CB6CB716
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -481,11 +481,10 @@ endif
ifeq ($(cc-name),clang)
ifneq ($(CROSS_COMPILE),)
CLANG_TRIPLE ?= $(CROSS_COMPILE)
CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)
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
CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)