Skip to content

Migrate run-make/issue-14500 to new rmake.rs format #125047

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
May 14, 2024
Merged

Migrate run-make/issue-14500 to new rmake.rs format #125047

merged 4 commits into from
May 14, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented May 12, 2024 •
edited
Loading

Part of #121876 and the associated Google Summer of Code project.

Note: I find suspicious that libbar.a is hardcoded and is not using the STATICLIB call to adapt to Windows platforms. Is this intentional? If not, this will need to be changed.
@rustbot
Copy link
Collaborator

rustbot commented May 12, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 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 May 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 12, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu reviewed May 13, 2024
View reviewed changes
src/tools/run-make-support/src/rustc.rs Outdated
Comment on lines 153 to 158
/// Pass a codegen option.
pub fn codegen_option(&mut self, option: &str) -> &mut Self {
self.cmd.arg("-C");
self.cmd.arg(option);
self
}
Copy link
Member

Choose a reason for hiding this comment

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

I think specific helpers for specific codegen options are better, i.e. .lto() over .codegen_options("lto") or something.
tests/run-make/issue-14500/rmake.rs
Copy link
Member

Choose a reason for hiding this comment

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

Please take the opportunity to rename this test to something that's not as opaque as issue-14500. Maybe reachable-extern-fn-available-lto?
tests/run-make/issue-14500/rmake.rs Outdated
use run_make_support::{cc, extra_c_flags, run, rustc, tmp_dir};

fn main() {
let libbar_path = tmp_dir().join("libbar.a");
Copy link
Member

Choose a reason for hiding this comment

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

I don't recall exactly, do we have a static library name helper? If not, can you add one?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is already one! I should use it.
@jieyouxu
Copy link
Member

@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 May 13, 2024
@jieyouxu jieyouxu mentioned this pull request May 13, 2024
Closed
@jieyouxu

This comment was marked as outdated.

Sign in to view
@jieyouxu
Copy link
Member

@rustbot author
@Oneirical
Copy link
Contributor Author

Well noticed. It just so happens that everyone (that we care about) uses just about the same naming convention for static libraries:

Here is the part that made me suspicious (in tools.mk):

mylibrary.lib on MSVC.

 ifeq ($(UNAME),Darwin) STATICLIB = $(TMPDIR)/lib$(1).a else ifdef IS_WINDOWS ifdef IS_MSVC STATICLIB = $(TMPDIR)/$(1).lib else STATICLIB = $(TMPDIR)/lib$(1).a endif else STATICLIB = $(TMPDIR)/lib$(1).a endif endif
@jieyouxu
Copy link
Member

Well noticed. It just so happens that everyone (that we care about) uses just about the same naming convention for static libraries:

Here is the part that made me suspicious (in tools.mk):

mylibrary.lib on MSVC.

 ifeq ($(UNAME),Darwin) STATICLIB = $(TMPDIR)/lib$(1).a else ifdef IS_WINDOWS ifdef IS_MSVC STATICLIB = $(TMPDIR)/$(1).lib else STATICLIB = $(TMPDIR)/lib$(1).a endif else STATICLIB = $(TMPDIR)/lib$(1).a endif endif

You're right, I completely forgot about msvc being special again... There's technically no standard here, but AFAICT msvc uses lib by its own convention. So yeah, we can use the static_library_name helper in the support library.
@jieyouxu
Copy link
Member

Thanks!

@bors r+ rollup
@bors
Copy link
Collaborator

bors commented May 14, 2024

📌 Commit 45b50d3 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 May 14, 2024
@compiler-errors compiler-errors mentioned this pull request May 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@bors
Auto merge of rust-lang#125120 - compiler-errors:rollup-mnjybwv, r=co…
ac385a5 
…mpiler-errors Rollup of 7 pull requests Successful merges: - rust-lang#119838 (style-guide: When breaking binops handle multi-line first operand better) - rust-lang#124844 (Use a proper probe for shadowing impl) - rust-lang#125047 (Migrate `run-make/issue-14500` to new `rmake.rs` format) - rust-lang#125080 (only find segs chain for missing methods when no available candidates) - rust-lang#125088 (Uplift `AliasTy` and `AliasTerm`) - rust-lang#125100 (Don't do post-method-probe error reporting steps if we're in a suggestion) - rust-lang#125118 (Use new utility functions/methods in run-make tests) r? `@ghost` `@rustbot` modify labels: rollup
@bors bors merged commit 844c7e8 into rust-lang:master May 14, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@rust-timer
Unrolled build for rust-lang#125047
43bc409 
Rollup merge of rust-lang#125047 - Oneirical:test5, r=jieyouxu Migrate `run-make/issue-14500` to new `rmake.rs` format Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Note: I find suspicious that `libbar.a` is hardcoded and is not using the `STATICLIB` call to adapt to Windows platforms. Is this intentional? If not, this will need to be changed.
@Oneirical Oneirical deleted the test5 branch May 15, 2024 00:08
celinval pushed a commit to celinval/rust-dev that referenced this pull request Jun 4, 2024
@github-actions @tautschnig
Automatic toolchain upgrade to nightly-2024-05-15 (rust-lang#3185)
33b7d85 
Update Rust toolchain from nightly-2024-05-14 to nightly-2024-05-15 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@ab14f94 up to rust-lang@8387315. The log for this commit range is: rust-lang@8387315ab3 Auto merge of rust-lang#125125 - lovesegfault:opt-dist-specify-rustc-perf, r=Mark-Simulacrum rust-lang@c3c9783de2 feat(tools/opt-dist): allow local builds to specify a rustc-perf checkout rust-lang@ac385a5af6 Auto merge of rust-lang#125120 - compiler-errors:rollup-mnjybwv, r=compiler-errors rust-lang@31016d5879 Rollup merge of rust-lang#125118 - GuillaumeGomez:cleanup-run-make, r=jieyouxu rust-lang@d59f430eec Rollup merge of rust-lang#125100 - compiler-errors:faster, r=nnethercote rust-lang@712e7c37f7 Rollup merge of rust-lang#125088 - compiler-errors:uplift-alias-ty, r=lcnr rust-lang@8c64acdbdc Rollup merge of rust-lang#125080 - bvanjoi:fix-124946, r=nnethercote rust-lang@844c7e826e Rollup merge of rust-lang#125047 - Oneirical:test5, r=jieyouxu rust-lang@0458d8a53b Rollup merge of rust-lang#124844 - compiler-errors:shadow-probe, r=lcnr rust-lang@36287830a2 Rollup merge of rust-lang#119838 - joshtriplett:style-guide-binop-indent, r=compiler-errors rust-lang@ade33b02f2 only find segs chain for missing methods when no available candidates rust-lang@bdfd941f4d Auto merge of rust-lang#123816 - tgross35:f16-f128-mangling, r=michaelwoerister rust-lang@f97d915173 Use new utility functions/methods in run-make tests rust-lang@792a9bdd4b Enable v0 mangling tests and add checks for `f16`/`f128` rust-lang@809b84edba Add v0 symbol mangling for `f16` and `f128` rust-lang@31026b7fe3 Auto merge of rust-lang#125023 - morr0ne:linux-none-target, r=Nilstrieb rust-lang@68407f9049 fix typo in x86_64-unknown-linux-none docs rust-lang@c45e831d8f Auto merge of rust-lang#124228 - compiler-errors:lint-overcaptures, r=oli-obk rust-lang@58426f4a5b Auto merge of rust-lang#125026 - Oneirical:clink-tests, r=jieyouxu rust-lang@e098eb14ae Wording improvement rust-lang@e2d9c0d938 Fix missing word rust-lang@57c32a193f style-guide: When breaking binops handle multi-line first operand better rust-lang@dbd2ca6478 Use a proper probe for shadowing impl rust-lang@052de1da4f And finally add tests rust-lang@1529c661e4 Warn against redundant use<...> rust-lang@f3fb727b08 Don't suggest using use<> syntax to capture APITs rust-lang@6afe1352d9 Suggest adding use<> syntax rust-lang@554becc180 Add some commenting rust-lang@d57e57ca1f Implement initial IMPL_TRAIT_OVERCAPTURES lint rust-lang@8f97a2588c Add test to make sure suggestions are still quick rust-lang@fba5f44bd8 Auto merge of rust-lang#125098 - jhpratt:rollup-2qm4gga, r=jhpratt rust-lang@45b50d303c lto function, static_library call, rename rust-lang@9f8cdb286e Remove to_term rust-lang@1ad28a6f53 Uplift AliasTy rust-lang@812f89728a fix fmt rust-lang@2e4c90c3f7 Don't do post-method-probe error reporting steps if we're in a suggestion rust-lang@32d74f1800 Rollup merge of rust-lang#125090 - erickt:bump-fuchsia, r=tmandry rust-lang@209703af85 Rollup merge of rust-lang#125072 - Darksonn:pin-dyn-dispatch-sound, r=jhpratt rust-lang@18d9c039bb Rollup merge of rust-lang#124997 - gurry:124848-ice-should-be-sized, r=Nadrieril rust-lang@74a78af0e2 Rollup merge of rust-lang#116675 - joshlf:patch-10, r=scottmcm rust-lang@9105c57b7f Auto merge of rust-lang#124256 - nnethercote:rm-NtIdent-NtLifetime, r=petrochenkov rust-lang@34582118af Auto merge of rust-lang#125076 - compiler-errors:alias-term, r=lcnr rust-lang@95e519ecbf Remove `NtIdent` and `NtLifetime`. rust-lang@fa84018c2e Apply nits rust-lang@58ee9192e0 Migrate fuchsia docs from `pm` to `ffx` rust-lang@293b5cb1ca [ptr] Document maximum allocation size rust-lang@3bcdf3058e split out AliasTy -> AliasTerm rust-lang@b3a78c1d09 Add test for dynamic dispatch + Pin::new soundness rust-lang@9a63a42cb7 Remove a `Span` from `TokenKind::Interpolated`. rust-lang@71fd2cf5b4 fix function call and import rust-lang@a1b5ea0cc2 make tidy happy rust-lang@f2de5fb2ae rewrite issue-14500 to rmake rust-lang@a6f237ca85 docs: fix typo in platform-support docs rust-lang@923cdb35aa test: Add assembly tests for x86_64-unknown-linux-none target rust-lang@10c358f111 Make tidy happy rust-lang@e37d2989c1 remove trailing whitespace rust-lang@a2e7e79a13 Port c-link-to-rust-va-list-fn to Rust rust-lang@9cf080099d docs: Document x86_64-unknown-linux-none target rust-lang@a3ef01b1fc Add x86_64-unknown-linux-none target rust-lang@fb619ec208 FIx ICE while casting a type with error Co-authored-by: tautschnig <1144736+tautschnig@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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)

5 participants

@Oneirical @rustbot @rust-log-analyzer @jieyouxu @bors