about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorkubycsolutions <keshlam@kubyc.solutions>2022-11-09 17:26:25 -0500
committerKeshlam (Joe Kesselman) <60112771+kubycsolutions@users.noreply.github.com>2022-11-10 19:37:09 -0500
commitb8edf0213e794a8bd58206bf66aee3fe81be4e60 (patch)
treeca83f55b645c19cabfa3ad2fabbce447a3e85e0a /src/ci
parent0aaad9e757207657064d70bf9e6c1e6eb327bf15 (diff)
downloadrust-b8edf0213e794a8bd58206bf66aee3fe81be4e60.tar.gz
rust-b8edf0213e794a8bd58206bf66aee3fe81be4e60.zip
Avoid runtime dependency on static libstdc++
Usually, we do want to use the static C++ library when building rustc_llvm, but do not want to have that dependency at compiler runtime. Change the defaults to Make It So.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/run.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 9a247fb60a8..7de06ec35c3 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -123,6 +123,10 @@ else
   # (And PGO is its own can of worms).
   if [ "$NO_DOWNLOAD_CI_LLVM" = "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.download-ci-llvm=if-available"
+  else
+    # When building for CI we want to use the static C++ Standard library
+    # included with LLVM, since a dynamic libstdcpp may not be available.
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.static-libstdcpp"
   fi
 fi