try to make this cross-platform safe

rust-lang · Oct 21, 2018 · 90132e0 · 90132e0
1 parent 7dd0e38
commit 90132e0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -36,6 +36,7 @@ use std::io::{self, BufReader};
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, ExitStatus, Output, Stdio};
 use std::str;
+use std::env::consts::DLL_EXTENSION;
 
 use extract_gdb_version;
 use is_android_gdb_target;
@@ -1577,7 +1578,9 @@ impl<'test> TestCx<'test> {
             rustc.arg(format!("{}={}/lib{}",
                               aux_crate.key,
                               aux_dir.display(),
-                              &aux_crate.value.replace(".rs", ".so").replace("-","_")));
+                              aux_crate.value.replace(".rs", &format!(".{}", DLL_EXTENSION))
+                              .replace("-","_")
+                              ));
         }
 
         self.compose_and_run(