diff options
| author | bors <bors@rust-lang.org> | 2016-03-26 10:25:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-26 10:25:03 -0700 |
| commit | 65bc9d77308e55321f36f7c8381a98ed10f93f6a (patch) | |
| tree | 025ef8ae260c53286dbae300d284b8bf90e51717 /src/bootstrap | |
| parent | 8f34053f762f708430971a36fc4c6e665528ebe2 (diff) | |
| parent | 1eacb4a6c3e5d4d45cd69c0b32c7de89d2d26e89 (diff) | |
| download | rust-65bc9d77308e55321f36f7c8381a98ed10f93f6a.tar.gz rust-65bc9d77308e55321f36f7c8381a98ed10f93f6a.zip | |
Auto merge of #32503 - dotdash:llvm_attrs, r=eddyb
Fix building on ARM
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/build/native.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/bootstrap/build/native.rs b/src/bootstrap/build/native.rs index 00661998025..b3bd6b92299 100644 --- a/src/bootstrap/build/native.rs +++ b/src/bootstrap/build/native.rs @@ -39,12 +39,7 @@ pub fn llvm(build: &Build, target: &str) { let _ = fs::remove_dir_all(&dst.join("build")); t!(fs::create_dir_all(&dst.join("build"))); - let mut assertions = if build.config.llvm_assertions {"ON"} else {"OFF"}; - - // Disable LLVM assertions on ARM compilers until #32360 is fixed - if target.contains("arm") && target.contains("gnu") { - assertions = "OFF"; - } + let assertions = if build.config.llvm_assertions {"ON"} else {"OFF"}; // http://llvm.org/docs/CMake.html let mut cfg = cmake::Config::new(build.src.join("src/llvm")); |