From 056c7d01778c24e9a2d88d227aee0cc08558524e Mon Sep 17 00:00:00 2001 From: Yu Changchun Date: Wed, 7 Jul 2021 14:15:47 +0800 Subject: [PATCH] kernel-build: Use unified ohos clang tools instead of depending on libtinfo.so Signed-off-by: Yu Changchun --- README_zh.md | 2 +- kernel.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README_zh.md b/README_zh.md index 6857c66..0ca83fd 100644 --- a/README_zh.md +++ b/README_zh.md @@ -73,7 +73,7 @@ hisi\_linux-4.19\_hos\_l2.patch: 在Hi3516DV300芯片上支持arm架构的内核 ``` export TARGET_PRODUCT=Hi3516DV300 # HDF驱动需要 - export PATH=`pwd`/prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/bin:`pwd`/prebuilts/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin/:$PATH # 配置编译环境 + export PATH=`pwd`/prebuilts/clang/ohos/linux-x86_64/llvm/bin:`pwd`/prebuilts/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin/:$PATH # 配置编译环境 MAKE_OPTIONES="ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- CC=clang HOSTCC=clang" # 使用工程项目自带的clang环境 ``` diff --git a/kernel.mk b/kernel.mk index 97e8228..2420ea0 100644 --- a/kernel.mk +++ b/kernel.mk @@ -26,7 +26,7 @@ KERNEL_SRC_PATH := $(OHOS_BUILD_HOME)/kernel/linux-4.19 KERNEL_PATCH_PATH := $(OHOS_BUILD_HOME)/kernel/linux/patches/linux-4.19 KERNEL_CONFIG_PATH := $(OHOS_BUILD_HOME)/kernel/linux/config/linux-4.19 PREBUILTS_GCC_DIR := $(OHOS_BUILD_HOME)/prebuilts/gcc -CLANG_HOST_TOOLCHAIN := $(OHOS_BUILD_HOME)/prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/bin +CLANG_HOST_TOOLCHAIN := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/llvm/bin KERNEL_HOSTCC := $(CLANG_HOST_TOOLCHAIN)/clang KERNEL_PREBUILT_MAKE := make @@ -38,7 +38,7 @@ ifeq ($(PRODUCT_NAME), Hi3516DV300) else ifeq ($(PRODUCT_NAME), hi3516dv300) KERNEL_ARCH := arm ifeq ($(CLANG_CC), "") - CLANG_CC := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/clang-10.0.1/bin/clang + CLANG_CC := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/llvm/bin/clang endif endif -- Gitee