]> git.lizzy.rs Git - rust.git/commitdiff
simplify is_vxworks_pure_dynamic
authorBaoshan Pang <baoshan.pang@windriver.com>
Thu, 5 Sep 2019 18:26:29 +0000 (11:26 -0700)
committerBaoshan Pang <baoshan.pang@windriver.com>
Thu, 5 Sep 2019 21:00:26 +0000 (14:00 -0700)
src/tools/compiletest/src/runtest.rs

index 84123cf3265350c4d43b98ebc1499b9821e4ccfe..26fdfe9d1ef1b05bf7074edc9f376a2e26422531 100644 (file)
@@ -1733,14 +1733,7 @@ fn is_vxworks_pure_static(&self) -> bool {
     }
 
     fn is_vxworks_pure_dynamic(&self) -> bool {
-        if self.config.target.contains("vxworks") {
-            match env::var("RUST_VXWORKS_TEST_DYLINK") {
-                Ok(s) => s == "1",
-                _ => false
-            }
-        } else {
-            false
-        }
+        self.config.target.contains("vxworks") && !self.is_vxworks_pure_static()
     }
 
     fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {