linker: Synchronize native library search in rustc and linker by petrochenkov · Pull Request #129366 · rust-lang/rust

petrochenkov · 2024-08-21T17:47:17Z

Also search for static libraries with alternative naming (libname.a) on MSVC when producing executables or dynamic libraries, and not just rlibs.

This unblocks #123436.

try-job: x86_64-msvc

rustbot · 2024-08-21T17:47:24Z

r? @TaKO8Ki

rustbot has assigned @TaKO8Ki.
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

petrochenkov · 2024-08-21T22:57:30Z

Refactoring ControlFlow into Option went wrong.
Updated.

jieyouxu

Thanks, this LGTM in general. One question about if we want to want to add a test for the alternate naming scheme that's accepted by rustc but not the linker, but I don't feel too strongly about that, so feel free to r=me with or without the test.

compiler/rustc_codegen_ssa/src/back/linker.rs

compiler/rustc_metadata/src/native_libs.rs

compiler/rustc_codegen_ssa/src/back/link.rs

jieyouxu · 2024-08-22T10:45:21Z

r? jieyouxu

rustbot · 2024-08-27T14:58:48Z

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

petrochenkov · 2024-08-27T14:59:36Z

@bors try

bors · 2024-08-27T15:00:46Z

⌛ Trying commit cbaa24d with merge 04ee94a...

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

bors · 2024-08-27T16:45:11Z

☀️ Try build successful - checks-actions
Build commit: 04ee94a (04ee94af453c9ea3cc7151cb81c0e8003be522d1)

Previously `libname.a` naming was supported as a fallback when producing rlibs, but not when producing executables or dynamic libraries

petrochenkov · 2024-08-27T19:33:41Z

@rustbot ready

jieyouxu

Thanks, feel free to r=me after PR CI is green.

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

…kingjubilee Rollup of 9 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#127912 (std: make `thread::current` available in all `thread_local!` destructors) - rust-lang#128166 (Improved `checked_isqrt` and `isqrt` methods) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) r? `@ghost` `@rustbot` modify labels: rollup

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129731 (Allow running `./x.py test compiler`) r? `@ghost` `@rustbot` modify labels: rollup

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#126183 (Separate core search logic with search ui) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129403 (Ban non-array SIMD) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129731 (Allow running `./x.py test compiler`) - rust-lang#129754 (wasi: Fix sleeping for `Duration::MAX`) r? `@ghost` `@rustbot` modify labels: rollup

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

…iaskrgr Rollup of 15 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#126183 (Separate core search logic with search ui) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129642 (Bump backtrace to 0.3.74~ish) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129723 (Simplify some extern providers) - rust-lang#129724 (Remove `Option<!>` return types.) - rust-lang#129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries) - rust-lang#129731 (Allow running `./x.py test compiler`) - rust-lang#129751 (interpret/visitor: make memory order iteration slightly more efficient) - rust-lang#129754 (wasi: Fix sleeping for `Duration::MAX`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#129366 - petrochenkov:libsearch, r=jieyouxu linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

…-mingw-import-libraries, r=petrochenkov linker: Allow MSVC to use import libraries following the Meson/MinGW convention Hi all, This PR implements support for `MsvcLinker` to use import libraries following Meson and the MinGW toolchain's naming convention. Meson [follows the `libfoo.dll.a` naming convention](https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa) to disambiguate between static and import libraries. This support already existed for static libraries (see rust-lang#100101), but not for dynamic libraries. The latter case was added by duplicating the logic in `native_libs::find_native_static_library`, but a separate case was added in `link_dylib_by_name` for the Windows CRT libraries which must be handled by the linker itself. See for prerequisites rust-lang#129366, rust-lang#126094, and rust-lang#128370. All feedback is appreciated! Fixes rust-lang#122455 cc `@sdroege` `@nirbheek`

…nd-mingw-import-libraries, r=petrochenkov linker: Allow MSVC to use import libraries following the Meson/MinGW convention Hi all, This PR implements support for `MsvcLinker` to use import libraries following Meson and the MinGW toolchain's naming convention. Meson [follows the `libfoo.dll.a` naming convention](https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa) to disambiguate between static and import libraries. This support already existed for static libraries (see rust-lang#100101), but not for dynamic libraries. The latter case was added by duplicating the logic in `native_libs::find_native_static_library`, but a separate case was added in `link_dylib_by_name` for the Windows CRT libraries which must be handled by the linker itself. See for prerequisites rust-lang#129366, rust-lang#126094, and rust-lang#128370. All feedback is appreciated! Fixes rust-lang#122455 cc `@sdroege` `@nirbheek`

Rollup merge of rust-lang#123436 - amyspark:allow-msvc-to-use-meson-and-mingw-import-libraries, r=petrochenkov linker: Allow MSVC to use import libraries following the Meson/MinGW convention Hi all, This PR implements support for `MsvcLinker` to use import libraries following Meson and the MinGW toolchain's naming convention. Meson [follows the `libfoo.dll.a` naming convention](https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa) to disambiguate between static and import libraries. This support already existed for static libraries (see rust-lang#100101), but not for dynamic libraries. The latter case was added by duplicating the logic in `native_libs::find_native_static_library`, but a separate case was added in `link_dylib_by_name` for the Windows CRT libraries which must be handled by the linker itself. See for prerequisites rust-lang#129366, rust-lang#126094, and rust-lang#128370. All feedback is appreciated! Fixes rust-lang#122455 cc `@sdroege` `@nirbheek`

rustbot assigned TaKO8Ki Aug 21, 2024

rustbot added 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 Aug 21, 2024

petrochenkov mentioned this pull request Aug 21, 2024

linker: Allow MSVC to use import libraries following the Meson/MinGW convention #123436

Merged

This comment has been minimized.

Sign in to view

petrochenkov force-pushed the libsearch branch from fb09dfa to aa1ac73 Compare August 21, 2024 22:56

jieyouxu approved these changes Aug 22, 2024

View reviewed changes

compiler/rustc_codegen_ssa/src/back/linker.rs Show resolved Hide resolved

compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved

compiler/rustc_codegen_ssa/src/back/link.rs Show resolved Hide resolved

rustbot assigned jieyouxu and unassigned TaKO8Ki Aug 22, 2024

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 Aug 22, 2024

This comment was marked as resolved.

Sign in to view

petrochenkov force-pushed the libsearch branch from aa1ac73 to cbaa24d Compare August 27, 2024 14:58

rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Aug 27, 2024

petrochenkov added 3 commits August 27, 2024 22:13

linker: Synchronize native library search in rustc and linker

a1c36c6

linker: Better support alternative static library naming on MSVC

05bd36d

Previously `libname.a` naming was supported as a fallback when producing rlibs, but not when producing executables or dynamic libraries

docs: Update docs for the rustc's -L option

ac8f132

petrochenkov force-pushed the libsearch branch from cbaa24d to ac8f132 Compare August 27, 2024 19:32

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 Aug 27, 2024

jieyouxu approved these changes Aug 27, 2024

View reviewed changes

workingjubilee mentioned this pull request Aug 29, 2024

Rollup of 6 pull requests #129728

Closed

workingjubilee mentioned this pull request Aug 29, 2024

Rollup of 9 pull requests #129729

Closed

workingjubilee mentioned this pull request Aug 29, 2024

Rollup of 8 pull requests #129735

Closed

workingjubilee mentioned this pull request Aug 30, 2024

Rollup of 8 pull requests #129773

Closed

This was referenced Aug 31, 2024

Rollup of 17 pull requests #129807

Closed

Rollup of 15 pull requests #129809

Merged

bors merged commit 9f3ce40 into rust-lang:master Aug 31, 2024

rustbot added this to the 1.82.0 milestone Aug 31, 2024

workingjubilee mentioned this pull request Sep 13, 2024

stdlib code size increase in nightly-2024-09-01 for aarch64-linux-android #130320

Open

petrochenkov deleted the libsearch branch February 22, 2025 18:28

petrochenkov mentioned this pull request Mar 7, 2025

native_libs: More consistent native library search between rustc and linker #138170

Closed

Uh oh!

Conversation

petrochenkov commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 21, 2024

Uh oh!

This comment has been minimized.

petrochenkov commented Aug 21, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Aug 22, 2024

Uh oh!

This comment was marked as resolved.

rustbot commented Aug 27, 2024

Uh oh!

petrochenkov commented Aug 27, 2024

Uh oh!

bors commented Aug 27, 2024

Uh oh!

bors commented Aug 27, 2024

Uh oh!

petrochenkov commented Aug 27, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

petrochenkov commented Aug 21, 2024 •

edited

Loading