From 714b7e2f987f1b78d91ec331664f017076c0ec1f Mon Sep 17 00:00:00 2001
From: wuhuiquan <wuhuiquan4@huawei.com>
Date: Mon, 25 Nov 2024 20:56:56 +0800
Subject: [PATCH] [build] fix mac build config

Signed-off-by: wuhuiquan <wuhuiquan4@huawei.com>
---
 rust-build/build.sh              | 6 +++---
 rust-build/config.toml           | 3 +--
 rust-build/mac_arm64_config.toml | 2 +-
 rust-build/mac_x8664_config.toml | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rust-build/build.sh b/rust-build/build.sh
index 20c9bb4d814..927ea085697 100644
--- a/rust-build/build.sh
+++ b/rust-build/build.sh
@@ -27,7 +27,7 @@ case $(uname -m) in
 esac
 
 function update_config_toml_clang(){
-    # $1:clang path, $2:clang name, $4:ar name
+    # $1:clang path, $2:clang name, $3:ar name
 
     # add clang absolute path to shell tools
     sys_clang_dir="$(echo ${1} | sed 's/\//\\\//g')"
@@ -80,13 +80,13 @@ cp ${rust_down_dir}/*.tar.xz ${rust_source_dir}/build/cache/2023-07-13/
 curl -O -k -m 300 ${rust_down_net}/rustc-1.72.0-src.tar.gz
 tar xf rustc-1.72.0-src.tar.gz
 cd ${rust_down_dir}/rustc-1.72.0-src/
-cp -r .cargo/ ${rust_source_dir}
+cp -r .cargo ${rust_source_dir}
 cp -r vendor ${rust_source_dir}
 cp -r library ${rust_source_dir}
 cp -r src/doc/* ${rust_source_dir}/src/doc
 cp -r src/tools/cargo/* ${rust_source_dir}/src/tools/cargo
 
-cp -r ${root_build_dir}/../harmony/third_party_llvm-project/* ${rust_source_dir}/src/llvm-project/
+cp -r ${root_build_dir}/../harmony/llvm/* ${rust_source_dir}/src/llvm-project/
 
 cd ${rust_source_dir}
 if [ "${host_platform}" = "linux" ]; then
diff --git a/rust-build/config.toml b/rust-build/config.toml
index ee846c59b15..d0f386596d4 100644
--- a/rust-build/config.toml
+++ b/rust-build/config.toml
@@ -67,5 +67,4 @@ linker = "x86_64-w64-mingw32-clang"
 ar = "x86_64-w64-mingw32-ar"
 
 [dist]
-compression-formats = ["gz"]
-#include-mingw-linker = false
\ No newline at end of file
+compression-formats = ["gz"]
\ No newline at end of file
diff --git a/rust-build/mac_arm64_config.toml b/rust-build/mac_arm64_config.toml
index 4a76073b0aa..fa904f07aae 100644
--- a/rust-build/mac_arm64_config.toml
+++ b/rust-build/mac_arm64_config.toml
@@ -27,7 +27,7 @@ codegen-units = 1
 split-debuginfo = "packed"
 lto = "thin-local"
 backtrace = false
-description = "BiSheng Mobile CPU STD 202.0.0.B009"
+description = "xxxxx"
 channel = "nightly"
 strip = true
 stack-protector = "all"
diff --git a/rust-build/mac_x8664_config.toml b/rust-build/mac_x8664_config.toml
index ee53a448808..51a74539429 100644
--- a/rust-build/mac_x8664_config.toml
+++ b/rust-build/mac_x8664_config.toml
@@ -27,7 +27,7 @@ codegen-units = 1
 split-debuginfo = "packed"
 lto = "thin-local"
 backtrace = false
-description = "BiSheng Mobile CPU STD 202.0.0.B009"
+description = "xxxxx"
 channel = "nightly"
 strip = true
 stack-protector = "all"