From b8edf0213e794a8bd58206bf66aee3fe81be4e60 Mon Sep 17 00:00:00 2001
From: kubycsolutions <keshlam@kubyc.solutions>
Date: Wed, 9 Nov 2022 17:26:25 -0500
Subject: 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.
---
 src/ci/run.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ci')

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
 
-- 
cgit 1.4.1-3-g733a5