diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-03-17 06:50:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-03-17 06:50:39 -0700 |
| commit | d37515bcd43dc8dbc14199961dfdeec664881855 (patch) | |
| tree | ff034396b94bfef825141c896f2bd5ac9a2fe988 | |
| parent | 22facdee227c13930f3091f6749d0b3921a0ce25 (diff) | |
| parent | d891b95e5ada8aee59e4490861ba92d527a8c927 (diff) | |
Merge "kernelscripts: Use Linker from platform tools if AOSP tools are unavailable"
| -rw-r--r-- | kernel_definitions.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index a5759b7..666a4f0 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -82,8 +82,9 @@ ifeq ($(KERNEL_LLVM_SUPPORT),true) ifeq ($(USE_KERNEL_AOSP_LLVM), true) #Using kernel aosp-llvm compiler KERNEL_LLVM_BIN := $(KERNEL_AOSP_LLVM_CLANG) $(warning "Using latest kernel aosp llvm" $(KERNEL_LLVM_BIN)) - else + else #Using platform aosp-llvm binaries KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) + KERNEL_AOSP_LLVM_BIN := $(shell pwd)/$(shell (dirname $(CLANG))) $(warning "Not using latest aosp-llvm" $(KERNEL_LLVM_BIN)) endif real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu- AR=$(KERNEL_AOSP_LLVM_BIN)/llvm-ar LLVM_NM=$(KERNEL_AOSP_LLVM_BIN)/llvm-nm LD=$(KERNEL_AOSP_LLVM_BIN)/ld.lld |