From 6f0d6149366dc827ca064f96093cc445c22106f0 Mon Sep 17 00:00:00 2001
From: gco <gco@jazzhaiku.com>
Date: Mon, 13 Jun 2022 21:29:09 -0700
Subject: [PATCH] Do not try to statically link libstd++ on Solaris

Fixes: Error on bootstrapping : Empty search path given via '-L' (solaris) #97260
---
 src/bootstrap/compile.rs | 1 +
 src/bootstrap/native.rs  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 9958fc26be7a5..b4807d1ab3af2 100644
--- 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
index e23498873f3d3..18f82d024f87b 100644
--- 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 {