Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / bootstrap / build / native.rs

diff --git a/src/bootstrap/build/native.rs b/src/bootstrap/build/native.rs
index a9d84b60fbff81d244726559d3aadd2adcd2c5f3..bf0494bcd8c8c5a4240ca05579d8837d257b2700 100644 (file)
--- a/src/bootstrap/build/native.rs
+++ b/src/bootstrap/build/native.rs
@@ -86,6 +86,9 @@ pub fn llvm(build: &Build, target: &str) {
               .define("CMAKE_CXX_COMPILER", build.cxx(target));
         }
         cfg.build_arg("-j").build_arg(build.jobs().to_string());
+
+        cfg.define("CMAKE_C_FLAGS", build.cflags(target).join(" "));
+        cfg.define("CMAKE_CXX_FLAGS", build.cflags(target).join(" "));
     }
 
     // FIXME: we don't actually need to build all LLVM tools and all LLVM
@@ -113,7 +116,9 @@ pub fn compiler_rt(build: &Build, target: &str) {
     let dst = build.compiler_rt_out(target);
     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") {
+    let (dir, build_target, libname) = if target.contains("linux") ||
+                                          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"