Skip to content

make sysroot finding compatible with multiarch systems - #110281

Merged
bors merged 1 commit into
rust-lang:masterfrom
onur-ozkan:multiarch-compatible-sysroot-finding
Apr 23, 2023
Merged

make sysroot finding compatible with multiarch systems#110281
bors merged 1 commit into
rust-lang:masterfrom
onur-ozkan:multiarch-compatible-sysroot-finding

Conversation

@onur-ozkan

@onur-ozkanonur-ozkan commented Apr 13, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Tested on Debian 11 multiarch, worked just fine.

resolves#109994

@rustbot

rustbot commented Apr 13, 2023

Copy link
Copy Markdown
Collaborator

r? @jackh726

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 13, 2023
@est31

est31 commented Apr 14, 2023

Copy link
Copy Markdown
Member

@rustbot label +beta-nominated

@rustbot

rustbot commented Apr 14, 2023

Copy link
Copy Markdown
Collaborator

Error: Label beta-nominated can only be set by Rust team members

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

est31
est31 requested changes Apr 14, 2023
View reviewed changes
Comment threadcompiler/rustc_session/src/filesearch.rs Outdated
Comment threadcompiler/rustc_session/src/filesearch.rs Outdated
@onur-ozkan
make sysroot finding compatible with multiarch systems
2e98368
Signed-off-by: ozkanonur <work@onurozkan.dev>
@onur-ozkan
onur-ozkanforce-pushed the multiarch-compatible-sysroot-finding branch from a1251b1 to 2e98368CompareApril 14, 2023 12:04
@jackh726jackh726 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 16, 2023
@jackh726

jackh726 commented Apr 16, 2023

Copy link
Copy Markdown
Member

Any way we can write a test?

@onur-ozkan

onur-ozkan commented Apr 16, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Any way we can write a test?

The best way of testing this is having multiarch linux as CI runner(which I think we should have, just like having windows, mac and bsd runners cc @jyn514) which builds the compiler and runs the tests. Anything other than that would be supper annoying hacks.

@jyn514

jyn514 commented Apr 16, 2023

Copy link
Copy Markdown
Member

cc #102563

@apiraino

apiraino commented Apr 20, 2023

Copy link
Copy Markdown
Contributor

T-compiler is in favour of the beta backport but we should probably wait until it's merged in nightly. The backport will be reviewed again in a week. T-compiler meeting on Zulip.

@jackh726

jackh726 commented Apr 23, 2023

Copy link
Copy Markdown
Member

@bors r+ rollup=never

(Given this doesn't have a test, I'm going to make sure we can bisect easily)

@bors

bors commented Apr 23, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 2e98368 has been approved by jackh726

It is now in the queue for this repository.

@borsbors 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 Apr 23, 2023
@bors

bors commented Apr 23, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2e98368 with merge 7f94b31...

@bors

bors commented Apr 23, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 7f94b31 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2023
@bors
bors merged commit 7f94b31 into rust-lang:masterApr 23, 2023
@rustbotrustbot added this to the 1.71.0 milestone Apr 23, 2023
@onur-ozkan
onur-ozkan deleted the multiarch-compatible-sysroot-finding branch April 23, 2023 20:23
@rust-timer

rust-timer commented Apr 23, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (7f94b31): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)		4.2%[4.2%, 4.2%]1
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-1.2%[-1.2%, -1.2%]1
All ❌✅ (primary)4.2%[4.2%, 4.2%]1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.5%[2.0%, 3.1%]2
Improvements ✅
(primary)		-2.5%[-2.5%, -2.5%]1
Improvements ✅
(secondary)		-2.8%[-2.8%, -2.8%]1
All ❌✅ (primary)-2.5%[-2.5%, -2.5%]1

@apiraino

apiraino commented Apr 27, 2023

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 27, 2023
@cuvipercuviper mentioned this pull request Apr 27, 2023
Merged
@cuvipercuviper modified the milestones: 1.71.0, 1.70.0Apr 27, 2023
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2023
@bors
Auto merge ofrust-lang#110871- cuviper:beta-next, r=cuviper
071f14b
[beta] backport
This PR backports:
- Encode def span for ConstParam rust-lang#110425
- Update to LLVM 16.0.2 rust-lang#110535
- Encode lifetime param spans too rust-lang#110469
- make sysroot finding compatible with multiarch systems rust-lang#110281
- Update awscli rust-lang#110952
- Temporarily disable the jobserver-error test rust-lang#110361
Also bumps us to the latest released stable, 1.69.0.
r? `@cuviper`
@mqudsimqudsi mentioned this pull request May 22, 2024
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@est31est31est31 requested changes

Assignees

@jackh726jackh726

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

Manually moving shared libraries to a multiarch libdir, eg, /usr/lib/x86_64-linux-gnu, breaks after 1.67

9 participants

@onur-ozkan@rustbot@est31@jackh726@jyn514@apiraino@bors@rust-timer@cuviper