about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-19 15:49:37 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-20 08:35:47 -0800
commit1054171ac2a50a22c7cc1882493d1ccaed3a2c19 (patch)
tree253d675c5c7e27ac7e3d96c8936aa363a5847c74
parentb17492082756a223f503266f54300f81012f8aca (diff)
parent1080a69b01f4236747bf368556e052c4a2a43c3f (diff)
downloadrust-1054171ac2a50a22c7cc1882493d1ccaed3a2c19.tar.gz
rust-1054171ac2a50a22c7cc1882493d1ccaed3a2c19.zip
Rollup merge of #39132 - alexcrichton:static-libstdcpp, r=japaric
travis: Pass --enable-llvm-static-stdcpp

All our releases are compiled with this, so let's be sure to do so whenever
`DEPLOY` is set. This'll ensure that we don't have dynamic dependencies on
libstdc++ which LLVM depends on, but instead we link it all statically to have
more portable binaries.
-rwxr-xr-xsrc/ci/run.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 205228a7bcc..823970201f6 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -43,6 +43,7 @@ fi
 #        either automatically or manually.
 if [ "$DEPLOY" != "" ]; then
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
 
   if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"