Skip to content

De-duplicate all consecutive native libs regardless of their options#126943

Merged
bors merged 1 commit intorust-lang:masterfrom
Urgau:dedup-all
Jun 26, 2024
Merged

De-duplicate all consecutive native libs regardless of their options#126943
bors merged 1 commit intorust-lang:masterfrom
Urgau:dedup-all

Conversation

@Urgau
Copy link
Member

@Urgau Urgau commented Jun 25, 2024 •
edited
Loading

Address #126913 (comment) by no longer de-duplicating based on the "options" but by only looking at the generated link args, as to avoid consecutive libs that originated from different native-lib with different options (like raw-dylib on Windows) but isn't relevant for --print=native-static-libs.

r? @petrochenkov

@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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 25, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@Urgau
Copy link
Member Author

Urgau commented Jun 25, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126943 - Urgau:dedup-all, r=<try>
97a99ea 
De-duplicate all consecutive native libs regardless of their options

Address rust-lang#126913 (comment) by no longer de-duplicating based on the "options" but by only looking at the generated link args, as to avoid consecutive libs that originated from different native-lib with different options (like `raw-dylib` on Windows) but isn't relevant for `--print=native-static-libs`.

r? `@petrochenkov`
try-job: x86_64-msvc
@bors
Copy link
Collaborator

bors commented Jun 25, 2024

⌛ Trying commit 604caa0 with merge 97a99ea...

@petrochenkov
Copy link
Contributor

petrochenkov commented Jun 25, 2024

r=me when CI is green

@petrochenkov petrochenkov 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 Jun 25, 2024
@bors
Copy link
Collaborator

bors commented Jun 25, 2024

☀️ Try build successful - checks-actions
Build commit: 97a99ea (97a99ea9774afa22ae9eba3074694b8d97f6e884)

@Urgau
Copy link
Member Author

Urgau commented Jun 25, 2024

@bors r=@petrochenkov

@bors
Copy link
Collaborator

bors commented Jun 25, 2024

📌 Commit 604caa0 has been approved by petrochenkov

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 Jun 25, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 25, 2024
@compiler-errors
Rollup merge of rust-lang#126943 - Urgau:dedup-all, r=petrochenkov
095645c 
De-duplicate all consecutive native libs regardless of their options

Address rust-lang#126913 (comment) by no longer de-duplicating based on the "options" but by only looking at the generated link args, as to avoid consecutive libs that originated from different native-lib with different options (like `raw-dylib` on Windows) but isn't relevant for `--print=native-static-libs`.

r? `@petrochenkov`
@compiler-errors compiler-errors mentioned this pull request Jun 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126950 - compiler-errors:rollup-tj8xx0r, r=co…
4c56aa5 
…mpiler-errors

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level)
 - rust-lang#126907 (Fixes for 32-bit SPARC on Linux)
 - rust-lang#126932 (Tweak `FlatPat::new` to avoid a temporarily-invalid state)
 - rust-lang#126934 (fix broken build cache caused by rustdoc builds)
 - rust-lang#126943 (De-duplicate all consecutive native libs regardless of their options)
 - rust-lang#126946 (Add missing slash in `const_eval_select` doc comment)
 - rust-lang#126947 (Delegation: ast lowering refactor)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 25, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126951 - matthiaskrgr:rollup-xg0o4mc, r=matth…
85ef5b6 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126618 (Mark assoc tys live only if the corresponding trait is live)
 - rust-lang#126746 (Deny `use<>` for RPITITs)
 - rust-lang#126868 (not use offset when there is not ends with brace)
 - rust-lang#126884 (Do not ICE when suggesting dereferencing closure arg)
 - rust-lang#126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level)
 - rust-lang#126915 (Don't suggest awaiting in closure patterns)
 - rust-lang#126943 (De-duplicate all consecutive native libs regardless of their options)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126951 - matthiaskrgr:rollup-xg0o4mc, r=matth…
7dc6683 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126618 (Mark assoc tys live only if the corresponding trait is live)
 - rust-lang#126746 (Deny `use<>` for RPITITs)
 - rust-lang#126868 (not use offset when there is not ends with brace)
 - rust-lang#126884 (Do not ICE when suggesting dereferencing closure arg)
 - rust-lang#126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level)
 - rust-lang#126915 (Don't suggest awaiting in closure patterns)
 - rust-lang#126943 (De-duplicate all consecutive native libs regardless of their options)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126951 - matthiaskrgr:rollup-xg0o4mc, r=matth…
31f8b70 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126618 (Mark assoc tys live only if the corresponding trait is live)
 - rust-lang#126746 (Deny `use<>` for RPITITs)
 - rust-lang#126868 (not use offset when there is not ends with brace)
 - rust-lang#126884 (Do not ICE when suggesting dereferencing closure arg)
 - rust-lang#126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level)
 - rust-lang#126915 (Don't suggest awaiting in closure patterns)
 - rust-lang#126943 (De-duplicate all consecutive native libs regardless of their options)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 812b8b4 into rust-lang:master Jun 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 26, 2024
@rust-timer
Unrolled build for rust-lang#126943
0d324f0 
Rollup merge of rust-lang#126943 - Urgau:dedup-all, r=petrochenkov

De-duplicate all consecutive native libs regardless of their options

Address rust-lang#126913 (comment) by no longer de-duplicating based on the "options" but by only looking at the generated link args, as to avoid consecutive libs that originated from different native-lib with different options (like `raw-dylib` on Windows) but isn't relevant for `--print=native-static-libs`.

r? ``@petrochenkov``
@rustbot rustbot added this to the 1.81.0 milestone Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkov petrochenkov

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

No open projects
Oxidizing run-make tests
Status: Done

Milestone

1.81.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Urgau @rustbot @bors @petrochenkov

Comments