Skip to content
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

Jump to bottom

Respect --set=target.platform when building rustbuild itself #105920

Merged
merged 1 commit into from
Dec 30, 2022
Merged

Respect --set=target.platform when building rustbuild itself #105920

merged 1 commit into from
Dec 30, 2022

Conversation

MarcusCalhoun-Lopez
Copy link
Contributor

--set=target.platform.cc and --set=target.platform.cxx are ignored if target is quoted.

--set=target.platform.linker is ignored if RUSTFLAGS is not set.

Undo parts of
d1291dc and
1532fd8

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2022

r? @jyn514

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2022
jyn514
jyn514 reviewed Dec 19, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain more why this change is necessary? Won't this break #97263 again?

src/bootstrap/bootstrap.py Show resolved Hide resolved
@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 25, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jyn514
jyn514 reviewed Dec 25, 2022
View reviewed changes
src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
jyn514
jyn514 reviewed Dec 25, 2022
View reviewed changes
src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jyn514
jyn514 reviewed Dec 29, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This popped up again, for a target that does have a dot in it and wouldn't be fixed by this PR ... it makes me little uncomfortable to keep piling up hacks instead of fixing the parsing in bootstrap.py. https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/specifying.20linker.20for.20cross-compiling

src/bootstrap/bootstrap_test.py Outdated Show resolved Hide resolved
src/bootstrap/configure.py Show resolved Hide resolved
src/bootstrap/bootstrap.py Show resolved Hide resolved
@MarcusCalhoun-Lopez
Respect --set=target.platform during build
480297d 
Avoid quoting targets that do not contain a period.
See rust-lang@1532fd8

`--set=target.platform.linker` is ignored if RUSTFLAGS is not set.
Undo parts of rust-lang@d1291dc
@MarcusCalhoun-Lopez
Copy link
Contributor Author

This popped up again, for a target that does have a dot in it and wouldn't be fixed by this PR ... it makes me little uncomfortable to keep piling up hacks instead of fixing the parsing in bootstrap.py. https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/specifying.20linker.20for.20cross-compiling

I am afraid I do not know how to implement a "proper" fix.

@jyn514
Copy link
Member

jyn514 commented Dec 29, 2022

Ok, this seems reasonable. We can worry about a permanent fix later, this is still better than the status quo.

@MarcusCalhoun-Lopez thank you for sticking with this :)

@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2022

📌 Commit 480297d has been approved by jyn514

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 29, 2022
@jyn514 jyn514 changed the title Respect --set=target.platform during build Respect --set=target.platform when building rustbuild itself Dec 29, 2022
@bors
Copy link
Contributor

bors commented Dec 29, 2022

⌛ Testing commit 480297d with merge 2c7536e...

@bors
Copy link
Contributor

bors commented Dec 30, 2022

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing 2c7536e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2022
@bors bors merged commit 2c7536e into rust-lang:master Dec 30, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 30, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2c7536e): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)		 -3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) -1.0% [-1.0%, -1.0%] 1

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.

mean range count
Regressions ❌
(primary)		 2.3% [2.2%, 2.3%] 2
Regressions ❌
(secondary)		 6.9% [6.9%, 6.9%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.3% [2.2%, 2.3%] 2

Cycles

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

MarcusCalhoun-Lopez added a commit to macports/macports-ports that referenced this pull request Dec 30, 2022
@MarcusCalhoun-Lopez
rust: synchronize patches with merged PR
59b8931 
See rust-lang/rust#105920
No revbump since installed files will not change.
@MarcusCalhoun-Lopez MarcusCalhoun-Lopez deleted the respect_set branch December 30, 2022 05:12
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#105920 - MarcusCalhoun-Lopez:respect_set, r=j…
94ce71a 
…yn514

Respect --set=target.platform when building rustbuild itself

`--set=target.platform.cc` and `--set=target.platform.cxx` are ignored if target is quoted.

`--set=target.platform.linker` is ignored if RUSTFLAGS is not set.

Undo parts of
rust-lang@d1291dc and
rust-lang@1532fd8
@kiike kiike mentioned this pull request Sep 20, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@jyn514 jyn514

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)
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
7 participants
@MarcusCalhoun-Lopez @rustbot @rust-log-analyzer @jyn514 @bors @rust-timer @Mark-Simulacrum