Skip to content

Commit 9176fee

Browse files
authored
Merge pull request #4502 from Patrick-6/reduce-cc-version
Reduce required `cc` crate version for `genmc-sys` sub-crate
2 parents fb46410 + ecb046a commit 9176fee

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/tools/miri/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ dependencies = [
166166

167167
[[package]]
168168
name = "cc"
169-
version = "1.2.30"
169+
version = "1.2.16"
170170
source = "registry+https://github.com/rust-lang/crates.io-index"
171-
checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
171+
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
172172
dependencies = [
173173
"jobserver",
174174
"libc",

src/tools/miri/genmc-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2024"
1111
cxx = { version = "1.0.160", features = ["c++20"] }
1212

1313
[build-dependencies]
14-
cc = "1.2.30"
14+
cc = "1.2.16"
1515
cmake = "0.1.54"
1616
git2 = { version = "0.20.2", default-features = false, features = ["https"] }
1717
cxx-build = { version = "1.0.160", features = ["parallel"] }

src/tools/miri/genmc-sys/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,10 @@ fn compile_cpp_dependencies(genmc_path: &Path) {
215215
if enable_genmc_debug {
216216
bridge.define("ENABLE_GENMC_DEBUG", None);
217217
}
218+
for definition in definitions {
219+
bridge.flag(definition);
220+
}
218221
bridge
219-
.flags(definitions)
220222
.opt_level(2)
221223
.debug(true) // Same settings that GenMC uses (default for cmake `RelWithDebInfo`)
222224
.warnings(false) // NOTE: enabling this produces a lot of warnings.

0 commit comments

Comments
 (0)