about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-10-13 10:52:18 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-10-13 20:06:25 +0200
commitb57366a85457ddf6c5cb8ff4f329776c5311c5a4 (patch)
tree5bdc9ee23bff56bf87fc313baefc09e665217435 /src/ci
parente1643a8968753226dab7ab3c9fee826f097550f2 (diff)
downloadrust-b57366a85457ddf6c5cb8ff4f329776c5311c5a4.tar.gz
rust-b57366a85457ddf6c5cb8ff4f329776c5311c5a4.zip
Improve verify_llvm_ir config option
* Make it influence the behavior of the compiled rustc, rather than
  just the rustc build system. That is, if verify_llvm_ir=true,
  even manual invocations of the built rustc will verify LLVM IR.
* Enable verification of LLVM IR in CI, for non-deploy and
  deploy-alt builds. This is similar to how LLVM assertions are
  handled.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/run.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index a9e506645f1..42561cf95d3 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -61,6 +61,7 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
   elif [ "$DEPLOY_ALT" != "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
   fi
 else
   # We almost always want debug assertions enabled, but sometimes this takes too
@@ -74,6 +75,8 @@ else
   if [ "$NO_LLVM_ASSERTIONS" = "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
   fi
+
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
 fi
 
 if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then