diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-22 02:40:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 02:40:01 +0100 |
| commit | 35ff2f1df3ee2cd51edf2bbeddec474b970987fc (patch) | |
| tree | 130065b1f9d14dd94af01c44c81973cbe98a56d5 | |
| parent | 616373e6681822ae003390b2dd99ed7b801dd8c2 (diff) | |
| parent | 44603a5cd6044e91a9fa4c1a95c5aaf98adc5b05 (diff) | |
| download | rust-35ff2f1df3ee2cd51edf2bbeddec474b970987fc.tar.gz rust-35ff2f1df3ee2cd51edf2bbeddec474b970987fc.zip | |
Rollup merge of #67410 - mati865:mingw_link_fix, r=Mark-Simulacrum
Reenable static linking of libstdc++ on windows-gnu Fixes https://github.com/rust-lang/rust/issues/67408 Verified locally that `rustc_driver` is now statically linked to libstdc++.
| -rw-r--r-- | src/bootstrap/compile.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index baf9aabed00..831053bc0f7 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -563,7 +563,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: Interne // not for MSVC or macOS if builder.config.llvm_static_stdcpp && !target.contains("freebsd") && - !target.contains("windows") && + !target.contains("msvc") && !target.contains("apple") { let file = compiler_file(builder, builder.cxx(target).unwrap(), |