File tree 3 files changed +9
-4
lines changed
3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -87,9 +87,10 @@ changelog-seen = 2
87
87
# this flag will indicate that this version check should not be done.
88
88
#version-check = true
89
89
90
- # Link libstdc++ statically into the rustc_llvm instead of relying on a
91
- # dynamic version to be available.
92
- #static-libstdcpp = true
90
+ # When true, link libstdc++ statically into the rustc_llvm.
91
+ # This is useful if you don't want to use the dynamic version of that
92
+ # library provided by LLVM.
93
+ #static-libstdcpp = false
93
94
94
95
# Whether to use Ninja to build LLVM. This runs much faster than make.
95
96
#ninja = true
Original file line number Diff line number Diff line change @@ -781,7 +781,7 @@ impl Config {
781
781
config. llvm_optimize = true ;
782
782
config. ninja_in_file = true ;
783
783
config. llvm_version_check = true ;
784
- config. llvm_static_stdcpp = true ;
784
+ config. llvm_static_stdcpp = false ;
785
785
config. backtrace = true ;
786
786
config. rust_optimize = true ;
787
787
config. rust_optimize_tests = true ;
Original file line number Diff line number Diff line change @@ -123,6 +123,10 @@ else
123
123
# (And PGO is its own can of worms).
124
124
if [ " $NO_DOWNLOAD_CI_LLVM " = " " ]; then
125
125
RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set llvm.download-ci-llvm=if-available"
126
+ else
127
+ # When building for CI we want to use the static C++ Standard library
128
+ # included with LLVM, since a dynamic libstdcpp may not be available.
129
+ RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set llvm.static-libstdcpp"
126
130
fi
127
131
fi
128
132
You can’t perform that action at this time.
0 commit comments