Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Implement -Clink-self-contained=-linker opt out #116014

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

Merged
merged 7 commits into from
Oct 11, 2023
Merged

Implement -Clink-self-contained=-linker opt out #116014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71285c1
prepare stabilization of modern linker-flavors
lqd Sep 20, 2023
acc3b61
move `LinkSelfContainedComponents` to `rustc_target`
lqd Sep 20, 2023
2ce46f8
move single component parsing to dedicated function
lqd Sep 20, 2023
5b9aa26
implement opt out `-Clink-self-contained=-linker`
lqd Sep 20, 2023
6f54cbf
add `IntoIterator` impl for self-contained linking components
lqd Sep 21, 2023
1394874
consistency check for self-contained linking components CLI options
lqd Sep 21, 2023
d634cc5
add test for `-Clink-self-contained` consistency
lqd Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
prepare stabilization of modern linker-flavors 
fix a few comments
  • Loading branch information
@lqd
lqd committed Oct 8, 2023
commit 71285c1da04fe1f046151a9fe10bedfe9aebe3da
5 changes: 2 additions & 3 deletions compiler/rustc_session/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2758,9 +2758,8 @@ pub fn build_session_options(
}

// For testing purposes, until we have more feedback about these options: ensure `-Z
// unstable-options` is required when using the unstable `-C link-self-contained` options, like
// `-C link-self-contained=+linker`, and when using the unstable `-C linker-flavor` options, like
// `-C linker-flavor=gnu-lld-cc`.
// unstable-options` is required when using the unstable `-C link-self-contained` and `-C
// linker-flavor` options.
if !nightly_options::is_unstable_enabled(matches) {
let uses_unstable_self_contained_option =
cg.link_self_contained.are_unstable_variants_set();
Expand Down
10 changes: 5 additions & 5 deletions compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ pub enum LinkerFlavor {

/// Linker flavors available externally through command line (`-Clinker-flavor`)
/// or json target specifications.
/// FIXME: This set has accumulated historically, bring it more in line with the internal
/// linker flavors (`LinkerFlavor`).
/// This set has accumulated historically, and contains both (stable and unstable) legacy values, as
/// well as modern ones matching the internal linker flavors (`LinkerFlavor`).
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
pub enum LinkerFlavorCli {
// New (unstable) flavors, with direct counterparts in `LinkerFlavor`.
// Modern (unstable) flavors, with direct counterparts in `LinkerFlavor`.
Gnu(Cc, Lld),
Darwin(Cc, Lld),
WasmLld(Cc),
Expand All @@ -179,7 +179,7 @@ pub enum LinkerFlavorCli {
Bpf,
Ptx,

// Below: the legacy stable values.
// Legacy stable values
Gcc,
Ld,
Lld(LldFlavor),
Expand Down Expand Up @@ -504,7 +504,7 @@ linker_flavor_cli_impls! {
(LinkerFlavorCli::Bpf) "bpf"
(LinkerFlavorCli::Ptx) "ptx"

// Below: legacy stable values
// Legacy stable flavors
(LinkerFlavorCli::Gcc) "gcc"
(LinkerFlavorCli::Ld) "ld"
(LinkerFlavorCli::Lld(LldFlavor::Ld)) "ld.lld"
Expand Down