diff options
| -rw-r--r-- | src/bootstrap/build/native.rs | 3 | ||||
| m--------- | src/llvm | 0 | ||||
| -rw-r--r-- | src/rustllvm/llvm-auto-clean-trigger | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/build/native.rs b/src/bootstrap/build/native.rs index a9d84b60fbf..52595d3638c 100644 --- a/src/bootstrap/build/native.rs +++ b/src/bootstrap/build/native.rs @@ -113,7 +113,8 @@ 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") { let os = if target.contains("android") {"-android"} else {""}; let arch = if arch.starts_with("arm") && target.contains("eabihf") { "armhf" diff --git a/src/llvm b/src/llvm -Subproject 69ef168544e4f15b793dd35d272008fde9a6e83 +Subproject be89e4b532fba8544f629c257460b63fe26c680 diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index bb34b6f38bf..c6b01def198 100644 --- a/src/rustllvm/llvm-auto-clean-trigger +++ b/src/rustllvm/llvm-auto-clean-trigger @@ -1,4 +1,4 @@ # If this file is modified, then llvm will be forcibly cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -2016-02-20 +2016-03-13 |