about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-08 05:24:16 +0000
committerbors <bors@rust-lang.org>2023-10-08 05:24:16 +0000
commitfea943debfab3859853ef623e06248ffbfd603ab (patch)
tree4c07a75ca5fca19e4b4d6d7bb3a348d707db9b5d
parentc9f6ac45d9a57e60ed4b2d63c96af49be2219ba1 (diff)
parent2753052adf3b21f7af1218b6a325484a5481658e (diff)
downloadrust-fea943debfab3859853ef623e06248ffbfd603ab.tar.gz
rust-fea943debfab3859853ef623e06248ffbfd603ab.zip
Auto merge of #116487 - tamird:avoid-unwrap-absolute, r=bjorn3
compiler: env/path handling fixes

Please see individual commits. r? `@bjorn3` cf. #116426
-rw-r--r--build_system/main.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_system/main.rs b/build_system/main.rs
index 798ae9dbd50..e8cf486e966 100644
--- a/build_system/main.rs
+++ b/build_system/main.rs
@@ -55,7 +55,7 @@ enum CodegenBackend {
 }
 
 fn main() {
-    if env::var("RUST_BACKTRACE").is_err() {
+    if env::var_os("RUST_BACKTRACE").is_none() {
         env::set_var("RUST_BACKTRACE", "1");
     }
     env::set_var("CG_CLIF_DISABLE_INCR_CACHE", "1");