From 010de873261825290942d09f7c820621adb34599 Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Wed, 7 May 2025 21:15:57 +0800 Subject: [PATCH] add asan/hwasan config Signed-off-by: liangxinyan --- config.toml | 1 + rust_build.sh | 7 ++++++- src/bootstrap/src/core/build_steps/llvm.rs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 833f020f7cd..19b8e00404a 100644 --- a/config.toml +++ b/config.toml @@ -6,6 +6,7 @@ target = ["x86_64-unknown-linux-gnu"] # 目标平台 extended = true # 构建完整的工具链（包括 rustfmt、clippy 等） tools = ["cargo", "rustfmt", "clippy", "rust-analyzer", "miri", "llvm-tools", "src", "rustdoc", "analysis", "rust-analyzer-proc-macro-srv", "wasm-component-ld", "cargo-miri"] # 包含的工具 profiler = true +sanitizers = true [rust] channel = "dev" diff --git a/rust_build.sh b/rust_build.sh index 346d95f8023..d14f565c1ba 100755 --- a/rust_build.sh +++ b/rust_build.sh @@ -37,7 +37,12 @@ pushd $CURRENT_DIR > /dev/null if [[ ! -d src/llvm-project ]]; then mkdir -p src/llvm-project fi - cp -rf tmp_rust/src/llvm-project/* src/llvm-project/ + pushd src > /dev/null + rm -rf llvm-project + git clone https://gitee.com/openharmony/third_party_llvm-project.git -b llvm-19.1.7 + mv third_party_llvm-project llvm-prject && rm -rf llvm-project/.git + popd > /dev/null + #cp -rf tmp_rust/src/llvm-project/* src/llvm-project/ if [[ ! -d src/tools/enzyme ]]; then mkdir -p src/tools/enzyme diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs index a2d40f6fbd8..c1ffc527716 100644 --- a/src/bootstrap/src/core/build_steps/llvm.rs +++ b/src/bootstrap/src/core/build_steps/llvm.rs @@ -1242,7 +1242,7 @@ fn supported_sanitizers( "x86_64-unknown-illumos" => common_libs("illumos", "x86_64", &["asan"]), "x86_64-pc-solaris" => common_libs("solaris", "x86_64", &["asan"]), "x86_64-unknown-linux-gnu" => { - common_libs("linux", "x86_64", &["asan", "dfsan", "lsan", "msan", "safestack", "tsan"]) + common_libs("linux", "x86_64", &["asan", "dfsan", "lsan", "msan", "safestack", "tsan", "hwasan"]) } "x86_64-unknown-linux-musl" => { common_libs("linux", "x86_64", &["asan", "lsan", "msan", "tsan"]) -- Gitee