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

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.

By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation20 Commits3 Checks6 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

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

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

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

This comment has been minimized.

Refactoring ControlFlow into Option went wrong.
Updated.

Choose a reason for hiding this comment

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

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.

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.

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 27, 2024

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

☀️ 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

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

Choose a reason for hiding this comment

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

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

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request

Aug 29, 2024

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

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request

Aug 29, 2024

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 added a commit to rust-lang-ci/rust that referenced this pull request

Aug 29, 2024

…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

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request

Aug 29, 2024

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 added a commit to rust-lang-ci/rust that referenced this pull request

Aug 29, 2024

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 29, 2024

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 29, 2024

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 29, 2024

…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

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request

Aug 30, 2024

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 added a commit to rust-lang-ci/rust that referenced this pull request

Aug 30, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 30, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 30, 2024

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Aug 31, 2024

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

This was referenced

Aug 31, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Aug 31, 2024

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Aug 31, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Sep 15, 2024

…-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 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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Sep 16, 2024

…-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 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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Sep 16, 2024

…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 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

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Sep 16, 2024

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 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

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.