about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorBjörn Steinbrink <bsteinbr@gmail.com>2016-03-26 12:35:45 +0100
committerBjörn Steinbrink <bsteinbr@gmail.com>2016-03-26 13:02:54 +0100
commit1eacb4a6c3e5d4d45cd69c0b32c7de89d2d26e89 (patch)
tree8a441c27cf3cc2d59b82d917349ac3348d5a8242 /src/bootstrap
parent95697a83955c03d42eaaac6ecedcae04bd6986c9 (diff)
downloadrust-1eacb4a6c3e5d4d45cd69c0b32c7de89d2d26e89.tar.gz
rust-1eacb4a6c3e5d4d45cd69c0b32c7de89d2d26e89.zip
Revert "disable llvm assertions on ARM compilers"
This reverts commit afbbb74fecb3945336520d1930bd52bed9ed0819.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/build/native.rs7
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"));