user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add fix for full tools and sanitizer"

Browse source 
This reverts commit 6efacfb7a5.
This commit is contained in:
LuuuXXX 2025-03-04 17:38:06 +08:00
parent 6efacfb7a5
commit 4dab55bcaa
8 changed files with 16 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bootstrap/src/core/build_steps/llvm.rs
View file

@ -814,10 +814,6 @@ fn configure_cmake(
cflags.push(s);
}
if target.contains("ohos") {
cflags.push(" -D_LINUX_SYSINFO_H");
}
if builder.config.llvm_clang_cl.is_some() {
cflags.push(format!(" --target={target}"));
}
@ -838,11 +834,6 @@ fn configure_cmake(
cxxflags.push(" ");
cxxflags.push(s);
}
if target.contains("ohos") {
cxxflags.push(" -D_LINUX_SYSINFO_H");
}
if builder.config.llvm_clang_cl.is_some() {
cxxflags.push(format!(" --target={target}"));
}
@ -1229,10 +1220,6 @@ impl Step for Sanitizers {
cfg.define("COMPILER_RT_USE_LIBCXX", "OFF");
cfg.define("LLVM_CONFIG_PATH", &llvm_config);
if self.target.contains("ohos") {
cfg.define("COMPILER_RT_USE_BUILTINS_LIBRARY", "ON");
}
// On Darwin targets the sanitizer runtimes are build as universal binaries.
// Unfortunately sccache currently lacks support to build them successfully.
// Disable compiler launcher on Darwin targets to avoid potential issues.