Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bootstrap: tidy up flag handling for llvm build #93918

Merged
merged 2 commits into from
Feb 15, 2022
Merged

bootstrap: tidy up flag handling for llvm build #93918

merged 2 commits into from
Feb 15, 2022

Commits on Feb 12, 2022

  1. bootstrap: make LLVM build respect *FLAGS envvars 

    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.

Fixes rust-lang#93880.
    Jon Gjengset committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    07dae5a View commit details
    Browse the repository at this point in the history

  2. bootstrap: -static-libstdc++ is a linker flag 

    Fixes rust-lang#70468. Closes rust-lang#89983.
    Jon Gjengset committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    3669274 View commit details
    Browse the repository at this point in the history