about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorLuuuXXX <luuux98@163.com>2025-03-04 17:38:06 +0800
committerLuuuXXX <luuux98@163.com>2025-03-04 17:38:06 +0800
commit4dab55bcaa3f1a60f11b3ff36159c199bc210616 (patch)
tree8fc9ae3788335d42982a8101a68a295ad35722bf /src/bootstrap
parent6efacfb7a59ebde2620398861713fae136060a04 (diff)
downloadrust-4dab55bcaa3f1a60f11b3ff36159c199bc210616.tar.gz
rust-4dab55bcaa3f1a60f11b3ff36159c199bc210616.zip
Revert "add fix for full tools and sanitizer"
This reverts commit 6efacfb7a59ebde2620398861713fae136060a04.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/build_steps/llvm.rs13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 6a392b6bd7c..5919e989b34 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -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.