Skip to content

Commit b7a0c9d

Browse files
committed
Setup cargo environment for cargo rustc --print
1 parent cedab5d commit b7a0c9d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cargo/ops/cargo_compile/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use std::sync::Arc;
4141

4242
use crate::core::compiler::unit_dependencies::build_unit_dependencies;
4343
use crate::core::compiler::unit_graph::{self, UnitDep, UnitGraph};
44-
use crate::core::compiler::{standard_lib, CrateType, TargetInfo};
44+
use crate::core::compiler::{apply_env_config, standard_lib, CrateType, TargetInfo};
4545
use crate::core::compiler::{BuildConfig, BuildContext, BuildRunner, Compilation};
4646
use crate::core::compiler::{CompileKind, CompileMode, CompileTarget, RustcTargetData, Unit};
4747
use crate::core::compiler::{DefaultExecutor, Executor, UnitInterner};
@@ -188,6 +188,7 @@ pub fn print<'a>(
188188
}
189189
let target_info = TargetInfo::new(gctx, &build_config.requested_kinds, &rustc, *kind)?;
190190
let mut process = rustc.process();
191+
apply_env_config(gctx, &mut process)?;
191192
process.args(&target_info.rustflags);
192193
if let Some(args) = target_rustc_args {
193194
process.args(args);

tests/testsuite/rustc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,6 @@ RUST_TARGET_PATH = { value = "./targets", relative = true }
821821

822822
p.cargo("rustc -Z unstable-options --print cfg")
823823
.masquerade_as_nightly_cargo(&["print"])
824-
.with_status(101)
825824
.with_stdout_data(str!["..."].unordered())
826825
.run();
827826
}

0 commit comments

Comments
 (0)