Skip to content

Port run-make --print=native-static-libs to rmake.rs#124383

Merged
bors merged 2 commits intorust-lang:masterfrom
Urgau:port-print-native-static-libs
Apr 27, 2024
Merged

Port run-make --print=native-static-libs to rmake.rs#124383
bors merged 2 commits intorust-lang:masterfrom
Urgau:port-print-native-static-libs

Conversation

@Urgau
Copy link
Copy Markdown
Member

@Urgau Urgau commented Apr 25, 2024

This PR port the run-make --print=native-static-libs test to rmake.rs

The dedup was really awful in the Makefile, I'm glad to finally have a proper dedup detection for this.

Related to #121876

r? @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Apr 25, 2024
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 25, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

jieyouxu
jieyouxu reviewed Apr 26, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks! Some nits and then r=me.

@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Apr 26, 2024

@rustbot author

@rustbot rustbot 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 Apr 26, 2024
@Urgau Urgau force-pushed the port-print-native-static-libs branch from e707ec7 to 74cbc09 Compare April 26, 2024 17:45
jieyouxu
jieyouxu approved these changes Apr 26, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks! I'll r+ once CI is green.

@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Apr 26, 2024

@bors r+ rollup

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 26, 2024

📌 Commit 74cbc09 has been approved by jieyouxu

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 Apr 26, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 26, 2024
@matthiaskrgr
Rollup merge of rust-lang#124383 - Urgau:port-print-native-static-lib…
c1a8abb 
…s, r=jieyouxu

Port run-make `--print=native-static-libs` to rmake.rs

This PR port the run-make `--print=native-static-libs` test to rmake.rs

The dedup was really awful in the `Makefile`, I'm glad to finally have a proper dedup detection for this.

Related to rust-lang#121876

r? `@jieyouxu`
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 26, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2024
@bors
Auto merge of rust-lang#124420 - matthiaskrgr:rollup-m4ovok7, r=matth…
7e4e574 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#124341 (resolve: Remove two cases of misleading macro call visiting)
 - rust-lang#124383 (Port run-make `--print=native-static-libs` to rmake.rs)
 - rust-lang#124391 (`rustc_builtin_macros` cleanups)
 - rust-lang#124408 (crashes: add more tests)
 - rust-lang#124410 (PathBuf: replace transmuting by accessor functions)

r? `@ghost`
`@rustbot` modify labels: rollup
@Urgau
Copy link
Copy Markdown
Member Author

Urgau commented Apr 26, 2024 •
edited
Loading

The PR failed the x86_64-msvc builder in #124420 (comment)

I forgot that MSVC targets use a different format for specifying libraries to the linker, they use the suffix .lib instead of the prefix -l.

Details 
$ rustc +nightly --target=x86_64-pc-windows-msvc --print=native-static-libs -lglib --crate-type=staticlib a.rs
note: Link against the following native artifacts when linking against this static library. The order and any duplication can be significant on some platforms.

note: native-static-libs: kernel32.lib advapi32.lib kernel32.lib ntdll.lib userenv.lib ws2_32.lib synchronization.lib kernel32.lib ws2_32.lib kernel32.lib msvcrt.lib /defaultlib:msvcrt glib.lib

I therefore updated the test to take that difference into account.

@rustbot ready

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2024
@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Apr 26, 2024

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 26, 2024

📌 Commit 7688f79 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2024
@jhpratt jhpratt mentioned this pull request Apr 26, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2024
@bors
Auto merge of rust-lang#124424 - jhpratt:rollup-o3ngkjy, r=jhpratt
80d1c83 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#124341 (resolve: Remove two cases of misleading macro call visiting)
 - rust-lang#124383 (Port run-make `--print=native-static-libs` to rmake.rs)
 - rust-lang#124391 (`rustc_builtin_macros` cleanups)
 - rust-lang#124408 (crashes: add more tests)
 - rust-lang#124410 (PathBuf: replace transmuting by accessor functions)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c8beab7 into rust-lang:master Apr 27, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2024
@rust-timer
Unrolled build for rust-lang#124383
80b6695 
Rollup merge of rust-lang#124383 - Urgau:port-print-native-static-libs, r=jieyouxu

Port run-make `--print=native-static-libs` to rmake.rs

This PR port the run-make `--print=native-static-libs` test to rmake.rs

The dedup was really awful in the `Makefile`, I'm glad to finally have a proper dedup detection for this.

Related to rust-lang#121876

r? `@jieyouxu`
@Urgau Urgau deleted the port-print-native-static-libs branch April 27, 2024 10:20
@jieyouxu jieyouxu mentioned this pull request Jun 9, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc 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.79.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Urgau @rustbot @jieyouxu @bors