-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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.
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
bootstrap: correct reading of flags for llvm #94466
Conversation
(rust-highfive has picked a reviewer for you, use r? to override) |
Hold on before merging this — I just realized there's actually another bug in the pre-existing logic that is what caused me to submit the (partially erroneous) fix is #93918. Specifically, we set both Line 553 in 8d6f527
This is wrong — when computing the base arguments for Lines 944 to 952 in 8d6f527
|
I've updated the PR to handle |
This comment has been minimized.
This comment has been minimized.
48ca19d
to
18a7573
Compare
This comment has been minimized.
This comment has been minimized.
18a7573
to
9c8cff9
Compare
r=me with squashed changes |
First, this reverts the `CFLAGS`/`CXXFLAGS` of rust-lang#93918. Those flags are already read by `cc` and populated into `Build` earlier on in the process. We shouldn't be overriding that based on `CFLAGS`, since `cc` also respects overrides like `CFLAGS_{TARGET}` and `HOST_CFLAGS`, which we want to take into account. Second, this adds the same capability to specify target-specific versions of `LDFLAGS` as we have through `cc` for the `C*` flags: https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables Note that this also necessitated an update to compiletest to treat CXXFLAGS separately from CFLAGS.
9c8cff9
to
9c05f0b
Compare
squashed and rebased onto |
@bors r+ |
📌 Commit 9c05f0b has been approved by |
…r=Mark-Simulacrum bootstrap: correct reading of flags for llvm First, this reverts the `CFLAGS`/`CXXFLAGS` of rust-lang#93918. Those flags are already read by `cc` and populated into `Build` earlier on in the process. We shouldn't be overriding that based on `CFLAGS`, since `cc` also respects overrides like `CFLAGS_{TARGET}` and `HOST_CFLAGS`, which we want to take into account. Second, this adds the same capability to specify target-specific versions of `LDFLAGS` as we have through `cc` for the `C*` flags: https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables
Rollup of 10 pull requests Successful merges: - rust-lang#88805 (Clarification of default socket flags) - rust-lang#93418 (rustdoc & doc: no `shortcut` for `rel="icon"`) - rust-lang#93913 (Remove the everybody loops pass) - rust-lang#93965 (Make regular stdio lock() return 'static handles) - rust-lang#94339 (ARM: Only allow using d16-d31 with asm! when supported by the target) - rust-lang#94404 (Make Ord and PartialOrd opt-out in `newtype_index`) - rust-lang#94466 (bootstrap: correct reading of flags for llvm) - rust-lang#94572 (Use `HandleOrNull` and `HandleOrInvalid` in the Windows FFI bindings.) - rust-lang#94575 (CTFE SwitchInt: update comment) - rust-lang#94582 (Fix a bug in `x.py fmt` that prevents some files being formatted.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
See #94719 (comment) -- approving for beta backport. |
…ulacrum [beta] backports * Update LLVM submodule rust-lang#94764 * Statically compile libstdc++ everywhere if asked rust-lang#94719 * Downgrade #[test] on macro call to warning rust-lang#94624 * Delay bug in expr adjustment when check_expr is called multiple times rust-lang#94596 * bootstrap: correct reading of flags for llvm rust-lang#94466 * Check method input expressions once rust-lang#94438 * remove feature gate in control_flow examples rust-lang#94283 r? `@Mark-Simulacrum`
First, this reverts the
CFLAGS
/CXXFLAGS
of #93918. Those flags arealready read by
cc
and populated intoBuild
earlier on in theprocess. We shouldn't be overriding that based on
CFLAGS
, sincecc
also respects overrides like
CFLAGS_{TARGET}
andHOST_CFLAGS
, whichwe want to take into account.
Second, this adds the same capability to specify target-specific
versions of
LDFLAGS
as we have throughcc
for theC*
flags:https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables