diff options
| author | bors <bors@rust-lang.org> | 2022-02-15 07:04:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-15 07:04:10 +0000 |
| commit | 6655109f58b7d0f4cae7e04eab476e389c9b9a0f (patch) | |
| tree | 7421ca184f8134ca51476ecb617f568587016c2b /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 8d163e66211c529465868a22686f46c5956342a4 (diff) | |
| parent | 36692741a2edef04a92021dcde05d9fa124f25e6 (diff) | |
| download | rust-6655109f58b7d0f4cae7e04eab476e389c9b9a0f.tar.gz rust-6655109f58b7d0f4cae7e04eab476e389c9b9a0f.zip | |
Auto merge of #93918 - jonhoo:bootstrap-native-envflags, r=Mark-Simulacrum
bootstrap: tidy up flag handling for llvm build This tidies up the logic in `src/bootstrap/native.rs` such that: - `CMAKE_*_LINKER_FLAGS` is not overridden if we add to it twice. - `CMAKE_*_FLAGS` also include the standard `*FLAGS` environment variables, which CMake respects when we _don't_ set `CMAKE_*_FLAGS`. - `llvm.ldflags` from `config.toml` appends to the ldflags Rust's bootstrap logic adds, rather than replacing them. It also takes a second stab at #89983 by moving `-static-libstdc++` to just be passed as a linker flag, since that's what it is. Fixes #93880. Fixes #70468. Closes #89983.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions