bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #98081 - gco:no_static_libcpp, r=jyn514

Browse source 
Do not try to statically link libstdc++ on Solaris

Fixes #97260
This commit is contained in:
bors 2022-06-17 20:11:03 +00:00
commit c3b7d7b496
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/bootstrap/compile.rs
View file

@ -730,6 +730,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
&& !target.contains("freebsd") && !target.contains("freebsd")
&& !target.contains("msvc") && !target.contains("msvc")
&& !target.contains("apple") && !target.contains("apple")
&& !target.contains("solaris")
{ {
let file = compiler_file( let file = compiler_file(
builder, builder,

2
src/bootstrap/native.rs
View file

@ -655,7 +655,7 @@ fn configure_cmake(
// For distribution we want the LLVM tools to be *statically* linked to libstdc++. // For distribution we want the LLVM tools to be *statically* linked to libstdc++.
// We also do this if the user explicitly requested static libstdc++. // We also do this if the user explicitly requested static libstdc++.
if builder.config.llvm_static_stdcpp { if builder.config.llvm_static_stdcpp {
if !target.contains("msvc") && !target.contains("netbsd") { if !target.contains("msvc") && !target.contains("netbsd") && !target.contains("solaris") {
if target.contains("apple") || target.contains("windows") { if target.contains("apple") || target.contains("windows") {
ldflags.push_all("-static-libstdc++"); ldflags.push_all("-static-libstdc++");
} else { } else {