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.

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

Make AIX known by bootstrap #115811

Merged
merged 4 commits into from
Sep 18, 2023
Merged

Make AIX known by bootstrap #115811

merged 4 commits into from
Sep 18, 2023

Conversation

bzEq
Copy link
Contributor

@bzEq bzEq commented Sep 13, 2023

Use x.py to build rustc on AIX directly is failing

unknown OS type: AIX
Build completed unsuccessfully in 0:00:00

If kernel is AIX, we should return default triple powerpc64-ibm-aix for current rustc.

@rustbot
Copy link
Collaborator

rustbot commented Sep 13, 2023

r? @Mark-Simulacrum

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

@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) labels Sep 13, 2023
@@ -312,6 +312,8 @@ def default_build_triple(verbose):
# non-standard string (e.g. gnuwin32 tools returns `windows32`). In
# these cases, fall back to using sys.platform.
return 'x86_64-pc-windows-msvc'
elif kernel == 'AIX':
Copy link
Member

Choose a reason for hiding this comment

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

Would it make more sense to add AIX to the kerneltype map above?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've added comment to describe the reason :).

@bzEq bzEq requested a review from Noratrieb September 13, 2023 09:28
@bzEq
Copy link
Contributor Author

bzEq commented Sep 13, 2023

@rustbot ready.

@Noratrieb
Copy link
Member

r? bootstrap

@Noratrieb Noratrieb removed their request for review September 13, 2023 18:14
@albertlarsan68
Copy link
Member

Flipping back to the original assignee...
r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 18, 2023

📌 Commit 122d1cc 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 Sep 18, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 18, 2023
…crum

Make AIX known by bootstrap

Use `x.py` to build rustc on AIX directly is failing
```
unknown OS type: AIX
Build completed unsuccessfully in 0:00:00
```
If kernel is `AIX`, we should return default triple `powerpc64-ibm-aix` for current rustc.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115558 (issue has since been fixed)
 - rust-lang#115724 (Add myself to the mailmap)
 - rust-lang#115795 (Refactor `opt-dist` to simplify local building)
 - rust-lang#115811 (Make AIX known by bootstrap)
 - rust-lang#115838 (inspect: closer to proof trees for coherence)
 - rust-lang#115902 (Fix up a few CI images)
 - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner)
 - rust-lang#115916 (Add me as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115558 (issue has since been fixed)
 - rust-lang#115724 (Add myself to the mailmap)
 - rust-lang#115811 (Make AIX known by bootstrap)
 - rust-lang#115838 (inspect: closer to proof trees for coherence)
 - rust-lang#115902 (Fix up a few CI images)
 - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner)
 - rust-lang#115908 (Do not clone MIR for const-prop lint.)
 - rust-lang#115916 (Add me as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c843ac2 into rust-lang:master Sep 18, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 18, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
Rollup merge of rust-lang#115811 - bzEq:make-aix-known, r=Mark-Simulacrum

Make AIX known by bootstrap

Use `x.py` to build rustc on AIX directly is failing
```
unknown OS type: AIX
Build completed unsuccessfully in 0:00:00
```
If kernel is `AIX`, we should return default triple `powerpc64-ibm-aix` for current rustc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

6 participants