optional check for TARGET env var

Ellen Arteca · Ellen Arteca · commit 4d0c0c28b3fc · 2022-08-03T01:21:28.000Z
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
@@ -370,7 +370,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // First deal with any external C functions in linked .so file
         // (if any SO file is specified, and if the host target == the session target)
         if this.machine.external_so_lib.as_ref().is_some()
-            && env!("TARGET") == this.tcx.sess.opts.target_triple.to_string()
+            && option_env!("TARGET") == Some(&this.tcx.sess.opts.target_triple.to_string())
         {
             // An Ok(false) here means that the function being called was not exported
             // by the specified SO file; we should continue and check if it corresponds to

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`370`	`370`	`// First deal with any external C functions in linked .so file`
`371`	`371`	`// (if any SO file is specified, and if the host target == the session target)`
`372`	`372`	`if this.machine.external_so_lib.as_ref().is_some()`
`373`		`- && env!("TARGET") == this.tcx.sess.opts.target_triple.to_string()`
	`373`	`+ && option_env!("TARGET") == Some(&this.tcx.sess.opts.target_triple.to_string())`
`374`	`374`	`{`
`375`	`375`	`// An Ok(false) here means that the function being called was not exported`
`376`	`376`	`// by the specified SO file; we should continue and check if it corresponds to`