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

Use gmake on AIX #14323

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Use gmake on AIX #14323

merged 1 commit into from
Jul 31, 2024

Conversation

bzEq
Copy link
Contributor

@bzEq bzEq commented Jul 30, 2024

AIX's make is different from GNU's make. Use GNU's make on AIX for tests instead.
Reference https://www.ibm.com/docs/en/aix/7.2?topic=m-make-command.

@rustbot
Copy link
Collaborator

rustbot commented Jul 30, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2024
@@ -57,6 +57,8 @@ fn validate(_: &str) {
fn make_exe() -> &'static str {
if cfg!(windows) {
"mingw32-make"
} else if cfg!(target_os = "aix") {
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the fix.

As I have mentioned earlier, we are not able to verify if this is the correct fix. Some questions:

  • Is GNU Make always installed as gmake on IBM AIX (I know the g prefix is a convention though)?
  • Would it be more preferable that downstream exclude these tests when running the test suite?

This is for test only and doesn't look bad, so I am not going to block this :)

Copy link
Contributor Author

@bzEq bzEq Jul 31, 2024

Choose a reason for hiding this comment

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

Is GNU Make always installed as gmake on IBM AIX (I know the g prefix is a convention though)?

Yes. It's installed via https://www.ibm.com/support/pages/aix-toolbox-open-source-software-downloads-alpha and there will be symbol link named /usr/bin/gmake which links to /opt/freeware/bin/make.

Would it be more preferable that downstream exclude these tests when running the test suite?

Since adding CI for AIX on github is hard, but we also want to deliver the same quality as tier-1 targets, we are maintaining an internal CI on AIX, running almost the same CI tasks(testing, packaging, stable/beta/nightly channel shifting...) as rust-lang org does. So for our strategy, we try our best to upstream changes for AIX, while not to break community's CI.

Copy link
Member

Choose a reason for hiding this comment

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

Sounds great. Thanks for your reply!

@@ -57,6 +57,8 @@ fn validate(_: &str) {
fn make_exe() -> &'static str {
if cfg!(windows) {
"mingw32-make"
} else if cfg!(target_os = "aix") {
Copy link
Member

Choose a reason for hiding this comment

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

Sounds great. Thanks for your reply!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 31, 2024

📌 Commit 8986af9 has been approved by weihanglo

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 Jul 31, 2024
@bors
Copy link
Contributor

bors commented Jul 31, 2024

⌛ Testing commit 8986af9 with merge 5ae2751...

@bors
Copy link
Contributor

bors commented Jul 31, 2024

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

@bors bors merged commit 5ae2751 into rust-lang:master Jul 31, 2024
22 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
Update cargo

15 commits in 257b72b8adfb1f2aa9916cefca67285c21666276..fa646583675d7c140482bd906145c71b7fb4fc2b
2024-07-30 15:08:27 +0000 to 2024-08-02 16:08:06 +0000
- refactor(toml): Rename 'resolved' to 'normalized' (rust-lang/cargo#14342)
- faq: rephrase offline usage. (rust-lang/cargo#14336)
- docs(unstable): Improve nightly link (rust-lang/cargo#14344)
- Fix a typo in 1.81 changes (rust-lang/cargo#14343)
- Change tests to support `rustc` wording changes (rust-lang/cargo#14341)
- chore(deps): update rust crate windows-sys to 0.59 (rust-lang/cargo#14335)
- chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14332)
- chore(deps): update compatible (rust-lang/cargo#14331)
- chore(deps): update rust crate rusqlite to 0.32.0 (rust-lang/cargo#14334)
- fix: also build manpage for cargo.md (rust-lang/cargo#14339)
- fix(config): Adjust MSRV resolve config field name / values (rust-lang/cargo#14296)
- fix(toml): Resolve regression from toml_edit 0.22.18 (rust-lang/cargo#14329)
- test(publish): More dev-dep stripping cases (rust-lang/cargo#14327)
- Use gmake on AIX (rust-lang/cargo#14323)
- fix(publish): Don't strip non-dev features (rust-lang/cargo#14325)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Aug 3, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants