]> git.lizzy.rs Git - rust.git/commitdiff
rustbuild: Fix cross to netbsd from Linux
authorAlex Crichton <alex@alexcrichton.com>
Thu, 17 Mar 2016 20:58:26 +0000 (13:58 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 17 Mar 2016 22:01:16 +0000 (15:01 -0700)
Apparently the NetBSD compiler-rt builds into the linux directory as well.
I'm... detecting a trend!

src/bootstrap/build/native.rs

index 52595d3638c27fe2a47dd2a220b040595a3d4c2c..b3bd6b92299654a01564290b7914da6e7836a86b 100644 (file)
@@ -114,7 +114,8 @@ pub fn compiler_rt(build: &Build, target: &str) {
     let arch = target.split('-').next().unwrap();
     let mode = if build.config.rust_optimize {"Release"} else {"Debug"};
     let (dir, build_target, libname) = if target.contains("linux") ||
-                                          target.contains("freebsd") {
+                                          target.contains("freebsd") ||
+                                          target.contains("netbsd") {
         let os = if target.contains("android") {"-android"} else {""};
         let arch = if arch.starts_with("arm") && target.contains("eabihf") {
             "armhf"