Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ KANI_SYSROOT ={value = "target/kani", relative = true}
KANI_BUILD_LIBS ={value = "target/build-libs", relative = true}
# Build Kani library without `build-std`.
KANI_LEGACY_LIBS ={value = "target/legacy-libs", relative = true}
# This is only required for stable but is a no-op for nightly channels
RUSTC_BOOTSTRAP = "1"

[target.'cfg(all())']
rustflags = [ # Global lints/warnings. Need to use underscore instead of -.
Expand Down
2 changes: 2 additions & 0 deletions kani-compiler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#![feature(f128)]
#![feature(f16)]
#![feature(non_exhaustive_omitted_patterns_lint)]
#![feature(cfg_version)]
#![cfg_attr(not(version("1.86")), feature(float_next_up_down))]
#![feature(try_blocks)]
extern crate rustc_abi;
extern crate rustc_ast;
Expand Down
2 changes: 2 additions & 0 deletions kani-driver/src/call_cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ crate-type = ["lib"]
// Use CARGO_ENCODED_RUSTFLAGS instead of RUSTFLAGS is preferred. See
// https://doc.rust-lang.org/cargo/reference/environment-variables.html
.env("CARGO_ENCODED_RUSTFLAGS", rustc_args.join(OsStr::new("\x1f")))
// This is only required for stable but is a no-op for nightly channels
.env("RUSTC_BOOTSTRAP", "1")
.env("CARGO_TERM_PROGRESS_WHEN", "never");

match self.run_build_target(cmd, verification_target.target()) {
Expand Down
2 changes: 2 additions & 0 deletions kani-driver/src/call_single_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ impl KaniSession {
let mut cmd = Command::new(&self.kani_compiler);
let kani_compiler_args = to_rustc_arg(kani_args);
cmd.arg(kani_compiler_args).args(rustc_args);
// This is only required for stable but is a no-op for nightly channels
cmd.env("RUSTC_BOOTSTRAP", "1");

if self.args.common_args.quiet {
self.run_suppress(cmd)?;
Expand Down
2 changes: 1 addition & 1 deletion tests/cargo-ui/verbose-cmds/expected
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CARGO_ENCODED_RUSTFLAGS=
cargo +nightly
cargo +
Running: `goto-cc
Running: `goto-instrument
Checking harness dummy_harness...
Expand Down
Loading