Add support for `target.'cfg(..)'.linker` #12535

Rustin170506 · 2023-08-21T02:38:47Z

What does this PR try to resolve?

close #12472

Add support for target.'cfg(..)'.linker.

How should we test and review this PR?

unit test
Better comments
Better code (~~can we reuse the same code?~~)

rustbot · 2023-08-21T02:38:51Z

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

Rustin170506

Still working in progress. Not ready for review.

Rustin170506

Still working in progress. Not ready for review.

weihanglo

Thanks! Could you update the doc with a new entry for target.<cfg>.runner, which should look like the runner one?

src/cargo/core/compiler/compilation.rs

tests/testsuite/tool_paths.rs

Rustin170506 · 2023-08-24T16:03:52Z

Could you update the doc with a new entry for target.<cfg>.runner, which should look like the runner one?

I will update it later.

weihanglo

Thanks for the effort. I guess only one thing left: this build script environment RUSTC_LINKER should update accordingly.

cargo/src/cargo/core/compiler/custom_build.rs

Lines 302 to 307 in e3b3ed8

    
           if let Some(linker) = &bcx.target_data.target_config(unit.kind).linker { 
        
               cmd.env( 
        
                   "RUSTC_LINKER", 
        
                   linker.val.clone().resolve_program(bcx.config), 
        
               ); 
        
           }

src/doc/src/reference/config.md

Rustin170506 · 2023-08-25T16:34:09Z

I guess only one thing left: this build script environment RUSTC_LINKER should update accordingly.

Good catch! Updated.

Rustin170506 · 2023-08-25T16:34:58Z

r? @weihanglo

Thanks for your review! 💚 💙 💜 💛 ❤️

weihanglo · 2023-08-28T02:14:57Z

Thanks for working on this along with us!

@bors r+

bors · 2023-08-28T02:14:59Z

📌 Commit 5e6f6f5 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-08-28T02:15:05Z

⌛ Testing commit 5e6f6f5 with merge 51f0d09...

Add support for `target.'cfg(..)'.linker`

weihanglo · 2023-08-28T06:07:39Z

@bors retry

weihanglo · 2023-08-28T06:14:14Z

@bors r-

weihanglo · 2023-08-28T06:14:20Z

@bors r+

bors · 2023-08-28T06:14:22Z

📌 Commit c9cc3b9 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-08-28T06:14:28Z

⌛ Testing commit c9cc3b9 with merge bfa04bb...

bors · 2023-08-28T07:00:01Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing bfa04bb to master...

Update cargo 18 commits in 925280f028db3a322935e040719a0754703947cf..96fe1c9e1aecd8f57063e3753969bb6418fd2fd5 2023-08-25 21:16:44 +0000 to 2023-08-29 20:10:34 +0000 - fix(lints): Fail when overriding inherited lints (rust-lang/cargo#12584) - cargo install: suggest --git when package name is url (rust-lang/cargo#12575) - chore: remove unstable-options for logout (rust-lang/cargo#12588) - Improve logout message for asymmetric tokens (rust-lang/cargo#12587) - fix(update): Remove references to -p in help (rust-lang/cargo#12586) - fix(update): Make `-p` more convenient by being positional (rust-lang/cargo#12545) - Set tracing target for networking messages. (rust-lang/cargo#12582) - Retry docs (rust-lang/cargo#12583) - feat(resolver): **Very** preliminary MSRV resolver support (rust-lang/cargo#12560) - Update git2 (rust-lang/cargo#12580) - Explain how `version` works for `git` dependencies (rust-lang/cargo#12270) - Improve deserialization errors of untagged enums (rust-lang/cargo#12574) - Add support for `target.'cfg(..)'.linker` (rust-lang/cargo#12535) - Improve resolver version mismatch warning (rust-lang/cargo#12573) - Stabilize `--keep-going` (rust-lang/cargo#12568) - Define {{command}} for use in src/doc/man/includes (rust-lang/cargo#12570) - Update serde (rust-lang/cargo#12569) - chore: add missing `windows-sys` features back (rust-lang/cargo#12563) r? ghost

`target.'cfg(all())'.linker` is apparently a recent addition: rust-lang/cargo#12535

Pkgsrc changes: * Remove NetBSD-8 support (embedded LLVm requires newer C++ than what is in -8; it's conceivable that this could still build with an external LLVM) * undo powerpc 9.0 file naming tweak, since we no longer support -8. * Remove patch to LLVM for powerpc now included by upstream. * Minor adjustments, checksum changes etc. Upstream changes: Version 1.74.1 (2023-12-07) =========================== - [Resolved spurious STATUS_ACCESS_VIOLATIONs in LLVM] (rust-lang/rust#118464) - [Clarify guarantees for std::mem::discriminant] (rust-lang/rust#118006) - [Fix some subtyping-related regressions] (rust-lang/rust#116415) Version 1.74.0 (2023-11-16) ========================== Language -------- - [Codify that `std::mem::Discriminant<T>` does not depend on any lifetimes in T] (rust-lang/rust#104299) - [Replace `private_in_public` lint with `private_interfaces` and `private_bounds` per RFC 2145] (rust-lang/rust#113126) Read more in [RFC 2145](https://rust-lang.github.io/rfcs/2145-type-privacy.html). - [Allow explicit `#[repr(Rust)]`] (rust-lang/rust#114201) - [closure field capturing: don't depend on alignment of packed fields] (rust-lang/rust#115315) - [Enable MIR-based drop-tracking for `async` blocks] (rust-lang/rust#107421) Compiler -------- - [stabilize combining +bundle and +whole-archive link modifiers] (rust-lang/rust#113301) - [Stabilize `PATH` option for `--print KIND=PATH`] (rust-lang/rust#114183) - [Enable ASAN/LSAN/TSAN for `*-apple-ios-macabi`] (rust-lang/rust#115644) - [Promote loongarch64-unknown-none* to Tier 2] (rust-lang/rust#115368) - [Add `i686-pc-windows-gnullvm` as a tier 3 target] (rust-lang/rust#115687) Libraries --------- - [Implement `From<OwnedFd/Handle>` for ChildStdin/out/err] (rust-lang/rust#98704) - [Implement `From<{&,&mut} [T; N]>` for `Vec<T>` where `T: Clone`] (rust-lang/rust#111278) - [impl Step for IP addresses] (rust-lang/rust#113748) - [Implement `From<[T; N]>` for `Rc<[T]>` and `Arc<[T]>`] (rust-lang/rust#114041) - [`impl TryFrom<char> for u16`] (rust-lang/rust#114065) - [Stabilize `io_error_other` feature] (rust-lang/rust#115453) - [Stabilize the `Saturating` type] (rust-lang/rust#115477) - [Stabilize const_transmute_copy] (rust-lang/rust#115520) Stabilized APIs --------------- - [`core::num::Saturating`] (https://doc.rust-lang.org/stable/std/num/struct.Saturating.html) - [`impl From<io::Stdout> for std::process::Stdio`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStdout%3E-for-Stdio) - [`impl From<io::Stderr> for std::process::Stdio`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`impl From<OwnedHandle> for std::process::Child{Stdin, Stdout, Stderr}`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`impl From<OwnedFd> for std::process::Child{Stdin, Stdout, Stderr}`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`std::ffi::OsString::from_encoded_bytes_unchecked`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.from_encoded_bytes_unchecked) - [`std::ffi::OsString::into_encoded_bytes`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.into_encoded_bytes) - [`std::ffi::OsStr::from_encoded_bytes_unchecked`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsStr.html#method.from_encoded_bytes_unchecked) - [`std::ffi::OsStr::as_encoded_bytes`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsStr.html#method.as_encoded_bytes) - [`std::io::Error::other`] (https://doc.rust-lang.org/stable/std/io/struct.Error.html#method.other) - [`impl TryFrom<char> for u16`] (https://doc.rust-lang.org/stable/std/primitive.u16.html#impl-TryFrom%3Cchar%3E-for-u16) - [`impl<T: Clone, const N: usize> From<&[T; N]> for Vec<T>`] (https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#impl-From%3C%26%5BT;+N%5D%3E-for-Vec%3CT,+Global%3E) - [`impl<T: Clone, const N: usize> From<&mut [T; N]> for Vec<T>`] (https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#impl-From%3C%26mut+%5BT;+N%5D%3E-for-Vec%3CT,+Global%3E) - [`impl<T, const N: usize> From<[T; N]> for Arc<[T]>`] (https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#impl-From%3C%5BT;+N%5D%3E-for-Arc%3C%5BT%5D,+Global%3E) - [`impl<T, const N: usize> From<[T; N]> for Rc<[T]>`] (https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#impl-From%3C%5BT;+N%5D%3E-for-Rc%3C%5BT%5D,+Global%3E) These APIs are now stable in const contexts: - [`core::mem::transmute_copy`] (https://doc.rust-lang.org/beta/std/mem/fn.transmute_copy.html) - [`str::is_ascii`] (https://doc.rust-lang.org/beta/std/primitive.str.html#method.is_ascii) - [`[u8]::is_ascii`] (https://doc.rust-lang.org/beta/std/primitive.slice.html#method.is_ascii) Cargo ----- - [fix: Set MSRV for internal packages] (rust-lang/cargo#12381) - [config: merge lists in precedence order] (rust-lang/cargo#12515) - [fix(update): Clarify meaning of --aggressive as --recursive] (rust-lang/cargo#12544) - [fix(update): Make `-p` more convenient by being positional] (rust-lang/cargo#12545) - [feat(help): Add styling to help output ] (rust-lang/cargo#12578) - [feat(pkgid): Allow incomplete versions when unambigious] (rust-lang/cargo#12614) - [feat: stabilize credential-process and registry-auth] (rust-lang/cargo#12649) - [feat(cli): Add '-n' to dry-run] (rust-lang/cargo#12660) - [Add support for `target.'cfg(..)'.linker`] (rust-lang/cargo#12535) - [Stabilize `--keep-going`] (rust-lang/cargo#12568) - [feat: Stabilize lints] (rust-lang/cargo#12648) Rustdoc ------- - [Add warning block support in rustdoc] (rust-lang/rust#106561) - [Accept additional user-defined syntax classes in fenced code blocks] (rust-lang/rust#110800) - [rustdoc-search: add support for type parameters] (rust-lang/rust#112725) - [rustdoc: show inner enum and struct in type definition for concrete type] (rust-lang/rust#114855) Compatibility Notes ------------------- - [Raise minimum supported Apple OS versions] (rust-lang/rust#104385) - [make Cell::swap panic if the Cells partially overlap] (rust-lang/rust#114795) - [Reject invalid crate names in `--extern`] (rust-lang/rust#116001) - [Don't resolve generic impls that may be shadowed by dyn built-in impls] (rust-lang/rust#114941) Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. None this cycle.

rustbot assigned ehuss Aug 21, 2023

rustbot added A-build-execution Area: anything dealing with executing the compiler A-rebuild-detection Area: rebuild detection and fingerprinting S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 21, 2023

Rustin170506 commented Aug 21, 2023

View reviewed changes

Rustin170506 force-pushed the rustin-patch-linker branch 3 times, most recently from 6d57b16 to 030319e Compare August 24, 2023 01:28

Rustin170506 marked this pull request as ready for review August 24, 2023 01:29

Rustin170506 changed the title ~~WIP: Add support for target.'cfg(..)'.linker~~ Add support for target.'cfg(..)'.linker Aug 24, 2023

weihanglo reviewed Aug 24, 2023

View reviewed changes

src/cargo/core/compiler/compilation.rs Outdated Show resolved Hide resolved

src/cargo/core/compiler/compilation.rs Show resolved Hide resolved

tests/testsuite/tool_paths.rs Show resolved Hide resolved

Rustin170506 force-pushed the rustin-patch-linker branch 3 times, most recently from e1e29bc to 2a94b4a Compare August 24, 2023 15:56

rustbot added the A-documenting-cargo-itself Area: Cargo's documentation label Aug 24, 2023

Rustin170506 requested a review from weihanglo August 24, 2023 16:23

Rustin170506 force-pushed the rustin-patch-linker branch from 873ac1e to a0395c4 Compare August 25, 2023 00:08

weihanglo requested changes Aug 25, 2023

View reviewed changes

src/doc/src/reference/config.md Outdated Show resolved Hide resolved

Rustin170506 force-pushed the rustin-patch-linker branch 2 times, most recently from 66dc5e2 to fe845c1 Compare August 25, 2023 15:31

rustbot added the A-build-scripts Area: build.rs scripts label Aug 25, 2023

Rustin170506 force-pushed the rustin-patch-linker branch 3 times, most recently from 63e4efe to 998ae74 Compare August 25, 2023 16:33

Rustin170506 requested a review from weihanglo August 25, 2023 16:34

Rustin170506 force-pushed the rustin-patch-linker branch from b3b06e0 to 8369fa0 Compare August 28, 2023 01:28

Add some tests

7cbc858

Rustin170506 force-pushed the rustin-patch-linker branch from 8369fa0 to 5e6f6f5 Compare August 28, 2023 01:29

weihanglo approved these changes Aug 28, 2023

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 28, 2023

bors added a commit that referenced this pull request Aug 28, 2023

Auto merge of #12535 - hi-rustin:rustin-patch-linker, r=weihanglo

51f0d09

Add support for `target.'cfg(..)'.linker`

Add target.<cfg>.linker docs

c9cc3b9

Rustin170506 force-pushed the rustin-patch-linker branch from 5e6f6f5 to c9cc3b9 Compare August 28, 2023 02:24

bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 28, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Aug 28, 2023

bors merged commit bfa04bb into rust-lang:master Aug 28, 2023

weihanglo mentioned this pull request Aug 29, 2023

Update cargo rust-lang/rust#115365

Merged

ehuss added this to the 1.74.0 milestone Sep 30, 2023

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 8, 2023

Use target.'cfg(all())'.rustflags in template

5154f04

`target.'cfg(all())'.linker` is apparently a recent addition: rust-lang/cargo#12535

smoelius added a commit to trailofbits/dylint that referenced this pull request Dec 8, 2023

Use target.'cfg(all())'.rustflags in template

7cb95dd

`target.'cfg(all())'.linker` is apparently a recent addition: rust-lang/cargo#12535

github-merge-queue bot pushed a commit to trailofbits/dylint that referenced this pull request Dec 9, 2023

Use target.'cfg(all())'.rustflags in template

42ccc58

`target.'cfg(all())'.linker` is apparently a recent addition: rust-lang/cargo#12535

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for `target.'cfg(..)'.linker` #12535

Add support for `target.'cfg(..)'.linker` #12535

Rustin170506 commented Aug 21, 2023 •

edited

Loading

rustbot commented Aug 21, 2023

Rustin170506 left a comment

Rustin170506 left a comment

weihanglo left a comment

Rustin170506 commented Aug 24, 2023

weihanglo left a comment

Rustin170506 commented Aug 25, 2023 •

edited

Loading

Rustin170506 commented Aug 25, 2023

weihanglo commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

weihanglo commented Aug 28, 2023

weihanglo commented Aug 28, 2023

weihanglo commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

	if let Some(linker) = &bcx.target_data.target_config(unit.kind).linker {
	cmd.env(
	"RUSTC_LINKER",
	linker.val.clone().resolve_program(bcx.config),
	);
	}

Add support for target.'cfg(..)'.linker #12535

Add support for target.'cfg(..)'.linker #12535

Conversation

Rustin170506 commented Aug 21, 2023 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

rustbot commented Aug 21, 2023

Rustin170506 left a comment

Choose a reason for hiding this comment

Rustin170506 left a comment

Choose a reason for hiding this comment

weihanglo left a comment

Choose a reason for hiding this comment

Rustin170506 commented Aug 24, 2023

weihanglo left a comment

Choose a reason for hiding this comment

Rustin170506 commented Aug 25, 2023 • edited Loading

Rustin170506 commented Aug 25, 2023

weihanglo commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

weihanglo commented Aug 28, 2023

weihanglo commented Aug 28, 2023

weihanglo commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

bors commented Aug 28, 2023

Add support for `target.'cfg(..)'.linker` #12535

Add support for `target.'cfg(..)'.linker` #12535

Rustin170506 commented Aug 21, 2023 •

edited

Loading

Rustin170506 commented Aug 25, 2023 •

edited

Loading