Skip to content

Cleanup dll/exe filename calculations in run_make_support #127960

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

jieyouxu
Copy link
Member

Use std::env::consts constants since now we have access to them (unlike in Makefiles!) ^^

cc @bzEq (this is one of the places in our test suites that tries to compute e.g. dylib extension; using std::env::consts::DLL_EXTENSION should correctly return a for AIX)

r? @fmease (thank you for the suggestion in #127760 (comment), this also improves correctness for the support library!)

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 19, 2024
@jieyouxu
Copy link
Member Author

Going to run a series of try-jobs in case this somehow breaks something.
@bors try

@jieyouxu
Copy link
Member Author

@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 Jul 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
Cleanup dll/exe filename calculations in `run_make_support`

Use `std::env::consts` constants since now we have access to them (unlike in Makefiles!) ^^

cc `@bzEq` (this is one of the places in our test suites that tries to compute e.g. dylib extension; using `std::env::consts::DLL_EXTENSION` should correctly return `a` for AIX)

r? `@fmease` (thank you for the suggestion in rust-lang#127760 (comment), this also improves correctness for the support library!)

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
@bors
Copy link
Collaborator

bors commented Jul 19, 2024

⌛ Trying commit 5fa0d15 with merge bd89020...

@bors
Copy link
Collaborator

bors commented Jul 19, 2024

☀️ Try build successful - checks-actions
Build commit: bd89020 (bd89020998d23f10af0ba45e5fc05c94d123f0e9)

@jieyouxu
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 19, 2024
@fmease
Copy link
Member

fmease commented Jul 19, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 19, 2024

📌 Commit 5fa0d15 has been approved by fmease

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 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112328 (Feat. adding ext that returns change_time)
 - rust-lang#126199 (Add `isqrt` to `NonZero<uN>`)
 - rust-lang#127856 (interpret: add sanity check in dyn upcast to double-check what codegen does)
 - rust-lang#127934 (Improve error when a compiler/library build fails in `checktools.sh`)
 - rust-lang#127960 (Cleanup dll/exe filename calculations in `run_make_support`)
 - rust-lang#127963 (Fix display of logo "border")
 - rust-lang#127967 (Disable run-make/split-debuginfo test for RISC-V 64)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e3f18bb into rust-lang:master Jul 19, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
Rollup merge of rust-lang#127960 - jieyouxu:minor-rmake-cleanup, r=fmease

Cleanup dll/exe filename calculations in `run_make_support`

Use `std::env::consts` constants since now we have access to them (unlike in Makefiles!) ^^

cc `@bzEq` (this is one of the places in our test suites that tries to compute e.g. dylib extension; using `std::env::consts::DLL_EXTENSION` should correctly return `a` for AIX)

r? `@fmease` (thank you for the suggestion in rust-lang#127760 (comment), this also improves correctness for the support library!)

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
@jieyouxu jieyouxu deleted the minor-rmake-cleanup branch July 20, 2024 09:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants