Skip to content

Comments

[beta] Ensure self-contained linker is only enabled on dev/nightly#126278

Merged
bors merged 2 commits intorust-lang:betafrom
lqd:beta
Jun 13, 2024
Merged

[beta] Ensure self-contained linker is only enabled on dev/nightly#126278
bors merged 2 commits intorust-lang:betafrom
lqd:beta

Conversation

@lqd
Copy link
Member

@lqd lqd commented Jun 11, 2024 •
edited
Loading

It seems the self-contained linker is enabled on beta. Let's fix that.

$ cargo clean && cargo +beta build && readelf -p .comment target/debug/helloworld
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.15s

String dump of section '.comment':
  [     0]  Linker: LLD 18.1.7
  [    14]  GCC: (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
  [    3f]  rustc version 1.80.0-beta.1 (75ac3b633 2024-06-10)

I will open a PR to fix it on master as well, right after I test CI's behavior on beta.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 11, 2024
@lqd
Copy link
Member Author

lqd commented Jun 11, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2024
@bors
Auto merge of rust-lang#126278 - lqd:beta, r=<try>
ddfa768 
[beta] Check self-contained linker status

It seems the self-contained linker is enabled on beta. Let's fix that.

r? ghost
@bors
Copy link
Collaborator

bors commented Jun 11, 2024

⌛ Trying commit f422f46 with merge ddfa768...

@lqd
Copy link
Member Author

lqd commented Jun 11, 2024

@bors try

@bors
Copy link
Collaborator

bors commented Jun 11, 2024

⌛ Trying commit 77c582a with merge dbf33b0...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2024
@bors
Auto merge of rust-lang#126278 - lqd:beta, r=<try>
dbf33b0 
[beta] Check self-contained linker status

It seems the self-contained linker is enabled on beta. Let's fix that.

r? ghost
@lqd
Copy link
Member Author

lqd commented Jun 11, 2024

The two debugging try builds show that

  • the config believes the self-contained linker is enabled
  • we also need to check the channel when requesting rustc to enable it

Before: https://github.com/rust-lang-ci/rust/actions/runs/9469516565/job/26088363223#step:26:2165

status: CFG_USE_SELF_CONTAINED_LINKER is enabled

After: https://github.com/rust-lang-ci/rust/actions/runs/9469689880/job/26088943335#step:26:2165

status: CFG_USE_SELF_CONTAINED_LINKER is disabled

@lqd lqd marked this pull request as ready for review June 11, 2024 17:09
@lqd lqd changed the title [beta] Check self-contained linker status [beta] Ensure self-contained linker is only enabled on dev/nightly Jun 11, 2024
@lqd
Copy link
Member Author

lqd commented Jun 11, 2024

This last try build should make a beta with rust-lld disabled on x64 linux. I'll make sure of that when the artifacts are available.

@bors try

r? @Mark-Simulacrum

There's some weird formatting issue in libstd on the beta branch, that seems also happened in #126273. I'm not sure what's up with that but I've added a formatting commit. Let me know whether I should drop it.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2024
@bors
Auto merge of rust-lang#126278 - lqd:beta, r=<try>
b001cae 
[beta] Ensure self-contained linker is only enabled on dev/nightly

It seems the self-contained linker is enabled on beta. Let's fix that.

```console
$ cargo clean && cargo +beta build && readelf -p .comment target/debug/helloworld
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.15s

String dump of section '.comment':
  [     0]  Linker: LLD 18.1.7
  [    14]  GCC: (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
  [    3f]  rustc version 1.80.0-beta.1 (75ac3b6 2024-06-10)
```

I will open a PR to fix it on master as well, right after I test CI's behavior on beta.
@bors
Copy link
Collaborator

bors commented Jun 11, 2024

⌛ Trying commit 50cb2ef with merge b001cae...

@lqd lqd mentioned this pull request Jun 11, 2024
Merged
@bors
Copy link
Collaborator

bors commented Jun 11, 2024

☀️ Try build successful - checks-actions
Build commit: b001cae (b001caeb5f27dc7d97ec2e0b24a4e044e4d90ae6)

@lqd
Copy link
Member Author

lqd commented Jun 11, 2024

This last try build should make a beta with rust-lld disabled on x64 linux. I'll make sure of that when the artifacts are available.

$ cargo clean -q && cargo +b001caeb5f27dc7d97ec2e0b24a4e044e4d90ae6 build -q && readelf -p .comment target/debug/helloworld

String dump of section '.comment':
  [     0]  GCC: (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
  [    2b]  rustc version 1.80.0-beta.2 (b001caeb5 2024-06-11)

(if such a try build on the beta branch correctly simulates a beta release)

@lqd lqd mentioned this pull request Jun 11, 2024
Merged
@danielhjacobs danielhjacobs mentioned this pull request Jun 11, 2024
Merged
@torokati44 torokati44 mentioned this pull request Jun 12, 2024
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jun 12, 2024

@bors r+ rollup=never

Format doesn't get enforced or run on non-master to avoid complicating backports with reformatting (or distro builds).

@bors
Copy link
Collaborator

bors commented Jun 12, 2024

📌 Commit 50cb2ef has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Jun 12, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 12, 2024
@compiler-errors
Rollup merge of rust-lang#126282 - lqd:contain-the-self-contained-lin…
49b28a4 
…ker, r=Mark-Simulacrum

Ensure self-contained linker is only enabled on dev/nightly

This is a version of rust-lang#126278 for the master branch. It should be no-op _here_, compared to beta.

I'll r? `@Mark-Simulacrum` like the other one.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 12, 2024
@rust-timer
Unrolled build for rust-lang#126282
0b78647 
Rollup merge of rust-lang#126282 - lqd:contain-the-self-contained-linker, r=Mark-Simulacrum

Ensure self-contained linker is only enabled on dev/nightly

This is a version of rust-lang#126278 for the master branch. It should be no-op _here_, compared to beta.

I'll r? `@Mark-Simulacrum` like the other one.
@bors
Copy link
Collaborator

bors commented Jun 13, 2024

⌛ Testing commit 50cb2ef with merge 544e5fb...

@bors
Copy link
Collaborator

bors commented Jun 13, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 544e5fb to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2024
@bors bors merged commit 544e5fb into rust-lang:beta Jun 13, 2024
@rustbot rustbot added this to the 1.80.0 milestone Jun 13, 2024
@lqd lqd deleted the beta branch June 13, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

4 participants

@lqd @bors @Mark-Simulacrum @rustbot