Merge pull request #18 from Wind-River/bpang-runtest-2

simplify is_vxworks_pure_dynamic()
This commit is contained in:
Baoshan 2019-09-05 14:35:43 -07:00 committed by GitHub
commit 109e16e857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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