cargo-creusot: Set by default --target-dir=target/creusot (#1288)

creusot-rs · Dec 4, 2024 · 5737d8f · 5737d8f
2 parents 8746e60 + dc63961
commit 5737d8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
@@ -141,6 +141,11 @@ fn invoke_cargo(args: &CreusotArgs, cargo_flags: Vec<String>) {
     // (the `mir_borrowck` hook in `creusot/src/callbacks.rs` is not called on all closures).
     cmd.env("CARGO_INCREMENTAL", "0");
 
+    // Prevent `cargo creusot` and `cargo` from invalidating each other's caches.
+    if env::var_os("CARGO_TARGET_DIR").is_none() {
+        cmd.env("CARGO_TARGET_DIR", "target/creusot");
+    }
+
     // Append flags to any pre-existing ones
     // CARGO_ENCODED_RUSTFLAGS contains options to pass to rustc, separated by '\x1f'.
     // https://doc.rust-lang.org/cargo/reference/environment-variables.html

diff --git a/creusot/tests/creusot-contracts.rs b/creusot/tests/creusot-contracts.rs
@@ -57,8 +57,6 @@ fn main() {
         "--span-mode=relative",
         "--spans-relative-to=creusot/tests/creusot-contracts",
         "--",
-        "--target-dir",
-        "target/creusot",
         "--package",
         "creusot-contracts",
     ]);

diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
@@ -62,9 +62,7 @@ fn main() {
         temp_file.as_os_str(),
         "--output-file=/dev/null".as_ref(),
     ]);
-    metadata_file
-        .args(&["--", "--target-dir", "target/creusot", "--package", "creusot-contracts"])
-        .env("CREUSOT_CONTINUE", "true");
+    metadata_file.args(&["--", "--package", "creusot-contracts"]).env("CREUSOT_CONTINUE", "true");
 
     if !metadata_file.status().expect("could not dump metadata for `creusot_contracts`").success() {
         // eprintln!("{}", String::from_utf8_lossy(&metadata_file.output().unwrap().stderr));