about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick-6 <pamu99@gmx.ch>2025-07-28 10:50:02 +0200
committerPatrick-6 <pamu99@gmx.ch>2025-07-28 10:50:02 +0200
commitecb046a63e94301463b8a5291d7ef9776c06aadc (patch)
tree58f1b500b7178bd7a7025898b616cf8cdc218b00
parentfb464108acad905de43b03dd61c5a69ca509a73d (diff)
downloadrust-ecb046a63e94301463b8a5291d7ef9776c06aadc.tar.gz
rust-ecb046a63e94301463b8a5291d7ef9776c06aadc.zip
Reduce required cc crate version.
-rw-r--r--src/tools/miri/Cargo.lock4
-rw-r--r--src/tools/miri/genmc-sys/Cargo.toml2
-rw-r--r--src/tools/miri/genmc-sys/build.rs4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/miri/Cargo.lock b/src/tools/miri/Cargo.lock
index ece51f2ba74..b46f0f83420 100644
--- a/src/tools/miri/Cargo.lock
+++ b/src/tools/miri/Cargo.lock
@@ -166,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.30"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
  "jobserver",
  "libc",
diff --git a/src/tools/miri/genmc-sys/Cargo.toml b/src/tools/miri/genmc-sys/Cargo.toml
index 95aef75afc4..737ab9073bf 100644
--- a/src/tools/miri/genmc-sys/Cargo.toml
+++ b/src/tools/miri/genmc-sys/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2024"
 cxx = { version = "1.0.160", features = ["c++20"] }
 
 [build-dependencies]
-cc = "1.2.30"
+cc = "1.2.16"
 cmake = "0.1.54"
 git2 = { version = "0.20.2", default-features = false, features = ["https"] }
 cxx-build = { version = "1.0.160", features = ["parallel"] }
diff --git a/src/tools/miri/genmc-sys/build.rs b/src/tools/miri/genmc-sys/build.rs
index f20e0e8d525..479a3bd7186 100644
--- a/src/tools/miri/genmc-sys/build.rs
+++ b/src/tools/miri/genmc-sys/build.rs
@@ -215,8 +215,10 @@ fn compile_cpp_dependencies(genmc_path: &Path) {
     if enable_genmc_debug {
         bridge.define("ENABLE_GENMC_DEBUG", None);
     }
+    for definition in definitions {
+        bridge.flag(definition);
+    }
     bridge
-        .flags(definitions)
         .opt_level(2)
         .debug(true) // Same settings that GenMC uses (default for cmake `RelWithDebInfo`)
         .warnings(false) // NOTE: enabling this produces a lot of warnings.