Auto merge of #102991 - Sp00ph:master, r=scottmcm

[rust.git] / src / ci / run.sh

diff --git a/src/ci/run.sh b/src/ci/run.sh
index 9a247fb60a8ee0535c20ecc4d5ab0f4e135c8ab4..7de06ec35c36bba75da44543d567f7603835341b 100755 (executable)
--- 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