Properly pass linker arguments that contain commas #132974
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
madsmtm
commented
Nov 13, 2024
petrochenkov
added
S-waiting-on-author
Using `cc_args` panics when using `-Clinker-flavor=ld`, because the arguments are in a form tailored for `-Clinker-flavor=gcc`. So instead, we use `link_args` and let that wrap the arguments with the appropriate `-Wl` or `-Xlinker` when needed.
madsmtm
force-pushed
the
linker-arguments-with-commas
branch
from
bb24a92 to
6bbf832
Compare
|
Thanks for the review, resolved now @rustbot ready |
rustbot
added
S-waiting-on-review
|
Thanks! |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 1, 2024
…as, r=petrochenkov Properly pass linker arguments that contain commas When linking with the system C compiler, we sometimes want to forward certain arguments unchanged to the linker. This can be done with `-Wl,arg1,arg2` or `-Xlinker arg1 -Xlinker arg2`. `-Wl` is used when possible, since it is more compact, but it does not support commas in the argument itself - in those cases, we need to use `-Xlinker`, and that is what this PR implements. This also fixes using sanitizers on macOS with `-Clinker-flavor=ld`, as those were previously manually using `-Wl`/`-Xlinker` (probably since the support wasn't present in the `link_args` function). Note that there has been [a previous PR for this](rust-lang#38798), but it only implemented this in certain cases when passing `-rpath`. r? compiler
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#128004 (codegen `#[naked]` functions using global asm) - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132974 (Properly pass linker arguments that contain commas) - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`) - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+) - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items) - rust-lang#133669 (Move some functions out of const_swap feature gate) - rust-lang#133674 (Fix chaining `carrying_add`s) - rust-lang#133691 (Check let source before suggesting annotation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2024
Rollup merge of rust-lang#132974 - madsmtm:linker-arguments-with-commas, r=petrochenkov Properly pass linker arguments that contain commas When linking with the system C compiler, we sometimes want to forward certain arguments unchanged to the linker. This can be done with `-Wl,arg1,arg2` or `-Xlinker arg1 -Xlinker arg2`. `-Wl` is used when possible, since it is more compact, but it does not support commas in the argument itself - in those cases, we need to use `-Xlinker`, and that is what this PR implements. This also fixes using sanitizers on macOS with `-Clinker-flavor=ld`, as those were previously manually using `-Wl`/`-Xlinker` (probably since the support wasn't present in the `link_args` function). Note that there has been [a previous PR for this](rust-lang#38798), but it only implemented this in certain cases when passing `-rpath`. r? compiler
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When linking with the system C compiler, we sometimes want to forward certain arguments unchanged to the linker. This can be done with
-Wl,arg1,arg2or-Xlinker arg1 -Xlinker arg2.-Wlis used when possible, since it is more compact, but it does not support commas in the argument itself - in those cases, we need to use-Xlinker, and that is what this PR implements.This also fixes using sanitizers on macOS with
-Clinker-flavor=ld, as those were previously manually using-Wl/-Xlinker(probably since the support wasn't present in thelink_argsfunction).Note that there has been a previous PR for this, but it only implemented this in certain cases when passing
-rpath.r? compiler