From f53cb6933a938f0d048b693a159f4429af7dec9b Mon Sep 17 00:00:00 2001
From: yangming_ha <yangming_ha@163.com>
Date: Tue, 30 Mar 2021 18:17:29 +0800
Subject: [PATCH] correct ohos clang config label.

---
 config/BUILD.gn       | 2 +-
 config/BUILDCONFIG.gn | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/BUILD.gn b/config/BUILD.gn
index 6aa8e36..7b55cee 100755
--- a/config/BUILD.gn
+++ b/config/BUILD.gn
@@ -109,7 +109,7 @@ config("pie_executable_config") {
   ldflags = [ "-pie" ]
 }
 
-config("clang") {
+config("ohos_clang") {
   clang_dir = ""
   if (ohos_build_compiler_dir != "") {
     clang_dir = rebase_path("${ohos_build_compiler_dir}")
diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index 6de3cbd..c5e69f3 100755
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -31,7 +31,6 @@ if (board_toolchain != "" && use_board_toolchain) {
   ohos_current_toolchain = board_toolchain
   ohos_current_toolchain_type = board_toolchain_type
   ohos_build_compiler = ohos_current_toolchain_type
-  hos_build_compiler = ohos_current_toolchain_type
   if (board_toolchain_path != "") {
     compile_prefix = "${board_toolchain_path}/${board_toolchain_prefix}"
   } else {
@@ -54,7 +53,7 @@ if (board_toolchain != "" && use_board_toolchain) {
     ohos_current_as_command = ohos_current_cc_command
     ohos_current_ld_command = ohos_current_cc_command
     ohos_current_strip_command = "$compile_prefix/llvm-objcopy --strip-all"
-    default_target_configs += [ "//build/lite/config:clang_opt" ]
+    default_target_configs = [ "//build/lite/config:clang_opt" ]
   }
 } else {
   # OHOS default toolchain: ohos_clang
@@ -71,7 +70,7 @@ if (board_toolchain != "" && use_board_toolchain) {
   ohos_current_strip_command =
       "$ohos_clang_toolchain_dir/llvm-objcopy --strip-all"
   set_default_toolchain("//build/lite/toolchain:linux_x86_64_ohos_clang")
-  default_target_configs = [ "//build/lite/config:clang" ]
+  default_target_configs = [ "//build/lite/config:ohos_clang" ]
   default_target_configs += [ "//build/lite/config:clang_opt" ]
 }
 
-- 
GitLab