diff --git a/README_zh.md b/README_zh.md index 7d6117628533ff0ae9984744ef4eb034507efc58..15e249dfada35465de70018dc3482353db18bea2 100644 --- a/README_zh.md +++ b/README_zh.md @@ -75,7 +75,7 @@ hi3516dv300_small.patch: 在Hi3516DV300芯片上支持arm架构的内核启动 ``` export TARGET_PRODUCT=Hi3516DV300 # HDF驱动需要 - export PATH=`pwd`/prebuilts/clang/host/linux-x86/clang-r353983c/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 e298289b025eb118a65fe5afd497d0a0e6b0e155..d1845a5eb1f679477e9cb6e047da342352509e35 100644 --- a/kernel.mk +++ b/kernel.mk @@ -26,8 +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 -PREBUILTS_CLANG_DIR := $(OHOS_BUILD_HOME)/prebuilts/clang -CLANG_HOST_TOOLCHAIN := $(PREBUILTS_CLANG_DIR)/host/linux-x86/clang-r353983c/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 @@ -39,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 := $(CLANG_HOST_TOOLCHAIN)/clang endif endif