From b23ef6022bfad204521bf84836dc6ff2d83c0f70 Mon Sep 17 00:00:00 2001 From: Youngwan Kim Date: Tue, 4 Sep 2018 17:25:48 +0900 Subject: [PATCH] AndroidKernel.mk: Get clang version from soong's global config. Change-Id: I0f5651470358bdabffe9ee31c238be06d675a228 Signed-off-by: Youngwan Kim --- AndroidKernel.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/AndroidKernel.mk b/AndroidKernel.mk index 6ffb6a940e78..88308bad193a 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -27,6 +27,11 @@ else KERNEL_CROSS_COMPILE := $(CROSS_COMPILE) endif +SOONG_GLOBAL_CONFIG := build/soong/cc/config/global.go +CLANG_VERSION := $(shell grep "ClangDefaultVersion" $(SOONG_GLOBAL_CONFIG) | grep -o "clang-[0-9][0-9]*") +CLANG_PATH := prebuilts/clang/host/linux-x86 +CC :=$(PWD)/$(CLANG_PATH)/$(CLANG_VERSION)/bin/clang + ifeq ($(CLANG_TRIPLE),) CLANG_TRIPLE := aarch64-linux-gnu- else @@ -85,7 +90,7 @@ $(KERNEL_CONFIG): phony-rebuild $(KERNEL_BIN): $(KERNEL_CONFIG) $(hide) echo "Building kernel..." - $(MAKE) -C $(TARGET_KERNEL_SOURCE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) CLANG_TRIPLE=$(CLANG_TRIPLE) CC=clang -j$(N_KERNEL_BUILD_THREAD) + $(MAKE) -C $(TARGET_KERNEL_SOURCE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) CLANG_TRIPLE=$(CLANG_TRIPLE) CC=$(CC) -j$(N_KERNEL_BUILD_THREAD) $(INSTALLED_KERNEL_TARGET): $(INSTALLED_DTBOIMAGE_TARGET) cp $(KERNEL_BIN) $(INSTALLED_KERNEL_TARGET) -- 2.20.1