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

Do not try to statically link libstdc++ on Solaris Fixes #97260
rust-lang · Jun 17, 2022 · c3b7d7b · c3b7d7b
2 parents 0cb9899 + 6f0d614
commit c3b7d7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -730,6 +730,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
  && !target.contains("freebsd")
  && !target.contains("msvc")
  && !target.contains("apple")
+ && !target.contains("solaris")
  {
  let file = compiler_file(
  builder,

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -655,7 +655,7 @@ fn configure_cmake(
  // For distribution we want the LLVM tools to be *statically* linked to libstdc++.
  // We also do this if the user explicitly requested static libstdc++.
  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") {
  ldflags.push_all("-static-libstdc++");
  } else {