diff options
| author | gco <gco@jazzhaiku.com> | 2022-06-13 21:29:09 -0700 |
|---|---|---|
| committer | gco <gco@jazzhaiku.com> | 2022-06-13 21:29:09 -0700 |
| commit | 6f0d6149366dc827ca064f96093cc445c22106f0 (patch) | |
| tree | 32c053bc6859a0cb9bc13e5c8605a8996957dae4 /src/bootstrap | |
| parent | 3bdec3c8abdc48e46715d7b14b764af28da1cee3 (diff) | |
| download | rust-6f0d6149366dc827ca064f96093cc445c22106f0.tar.gz rust-6f0d6149366dc827ca064f96093cc445c22106f0.zip | |
Do not try to statically link libstd++ on Solaris
Fixes: Error on bootstrapping : Empty search path given via '-L' (solaris) #97260
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 1 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 9958fc26be7..b4807d1ab3a 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 e23498873f3..18f82d024f8 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 { |