From 8c5d449ed14256711e1ad1f5d77ae7f98936fdbf Mon Sep 17 00:00:00 2001
From: Zachery Wu <zzzuo_shu@163.com>
Date: Fri, 18 Jun 2021 19:03:30 +0800
Subject: [PATCH] add L1 build sh

Signed-off-by: Zachery Wu <zzzuo_shu@163.com>
Change-Id: Ic0c02323937ca2c1a1261486def3ad07923b8dd0
---
 BUILD.gn               | 6 +++++-
 kernel.mk              | 6 ++++--
 kernel_module_build.sh | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 8e0e7ef..354f995 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5,5 +5,9 @@ import("//build/lite/config/component/lite_component.gni")
 build_ext_component("linux_kernel") {
   exec_path = rebase_path(".", root_build_dir)
   outdir = rebase_path("$root_out_dir")
-  command = "./kernel_module_build.sh ${outdir} ${board_name}"
+  clang_dir = ""
+  if (ohos_build_compiler_dir != "") {
+    clang_dir = rebase_path("${ohos_build_compiler_dir}")
+  }
+  command = "./kernel_module_build.sh ${outdir} ${board_name} ${clang_dir}"
 }
diff --git a/kernel.mk b/kernel.mk
index ca38ac7..15d2e41 100755
--- a/kernel.mk
+++ b/kernel.mk
@@ -28,7 +28,6 @@ KERNEL_CONFIG_PATH := $(OHOS_BUILD_HOME)/kernel/linux/config/linux-4.19
 PREBUILTS_GCC_DIR := $(OHOS_BUILD_HOME)/prebuilts/gcc
 PREBUILTS_CLANG_DIR := $(OHOS_BUILD_HOME)/prebuilts/clang
 CLANG_HOST_TOOLCHAIN := $(PREBUILTS_CLANG_DIR)/host/linux-x86/clang-r353983c/bin
-CLANG_CC := $(CLANG_HOST_TOOLCHAIN)/clang
 KERNEL_HOSTCC := $(CLANG_HOST_TOOLCHAIN)/clang
 KERNEL_PREBUILT_MAKE := make
 
@@ -36,9 +35,12 @@ ifeq ($(PRODUCT_NAME), Hi3516DV300)
     KERNEL_ARCH := arm
     KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin
     KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/arm-linux-gnueabi-
+    CLANG_CC := $(CLANG_HOST_TOOLCHAIN)/clang
 else ifeq ($(PRODUCT_NAME), hi3516dv300)
     KERNEL_ARCH := arm
-    CLANG_CC := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1/bin/clang
+    ifeq ($(CLANG_CC), "")
+        CLANG_CC := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1/bin/clang
+    endif
 endif
 
 KERNEL_PERL := /usr/bin/perl
diff --git a/kernel_module_build.sh b/kernel_module_build.sh
index 958071b..2a2a485 100755
--- a/kernel_module_build.sh
+++ b/kernel_module_build.sh
@@ -19,6 +19,10 @@ export OUT_DIR=$1
 if [ $2 == "hispark_taurus" ];then
     export TARGET_PRODUCT=hi3516dv300
     LINUX_KERNEL_OUT=${OUT_DIR}/kernel/linux-4.19
+    if [ $3 != "" ];then
+	LLVM_PATH=$3
+        export CLANG_CC=${LLVM_PATH}/bin/clang
+    fi
 elif [ $2 == "Hi3516DV300" ];then
     export TARGET_PRODUCT=Hi3516DV300
     LINUX_KERNEL_OUT=${OUT_DIR}/kernel/src_tmp/linux-4.19
-- 
Gitee