Skip to content

Uplift windows Cygwin DLL import libraries #15193

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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2025

Conversation

Berrysoft
Copy link

  • needed to link std correctly

Related: rust-lang/rust#134999

@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2025

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @weihanglo (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-cfg-expr Area: Platform cfg expressions S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 17, 2025
@weihanglo weihanglo changed the title add import library (.dll.a) file type for Cygwin Uplift windows Cygwin DLL import libraries Feb 17, 2025
@weihanglo weihanglo enabled auto-merge March 23, 2025 16:08
@weihanglo weihanglo added O-windows OS: Windows and removed A-cfg-expr Area: Platform cfg expressions labels Mar 23, 2025
@Berrysoft
Copy link
Author

I don't think the CI failure is related to this PR's changes...

@weihanglo
Copy link
Member

It looks like a regression in rustdoc in xcompile nightly feature (or a behavior change if that is intended).

This test::cargo_test_doctest_xcompile_ignores is affected:

  • rustdoc 1.87.0-nightly (b48576b4d 2025-03-22) failed
  • rustdoc 1.87.0-nightly (be73c1f46 2025-03-21) succeeded

And probably this PR rust-lang/rust#138535.

@weihanglo
Copy link
Member

@Berrysoft could you rebase onto master so we can merge it?

- needed to link std correctly

Signed-off-by: Ookiineko <[email protected]>
auto-merge was automatically disabled March 26, 2025 03:05

Head branch was pushed to by a user without write access

@rustbot rustbot added the A-cfg-expr Area: Platform cfg expressions label Mar 26, 2025
@Berrysoft
Copy link
Author

Rebased.

@weihanglo weihanglo enabled auto-merge March 26, 2025 03:16
@Berrysoft
Copy link
Author

A CI fails, because of stack overflow?

@weihanglo
Copy link
Member

We had that in the past: #14312 (comment). No idea how. Let me re-run.

---- freshness::same_build_dir_cached_packages stdout ----
running `D:\a\cargo\cargo\target\debug\cargo.exe build`

thread 'freshness::same_build_dir_cached_packages' panicked at tests\testsuite\freshness.rs:818:10:

test failed running `D:\a\cargo\cargo\target\debug\cargo.exe build`
error: process exited with code 101 (expected 0)
--- stdout

--- stderr
     Locking 3 packages to latest compatible versions
   Compiling d v0.0.1 (D:\a\cargo\cargo\target\tmp\cit\t1713\foo\d)
   Compiling c v0.0.1 (D:\a\cargo\cargo\target\tmp\cit\t1713\foo\c)
   Compiling b v0.0.1 (D:\a\cargo\cargo\target\tmp\cit\t1713\foo\b)
   Compiling a1 v0.0.1 (D:\a\cargo\cargo\target\tmp\cit\t1713\foo\a1)

thread 'main' has overflowed its stack
error: could not compile `c` (lib)

Caused by:
  process didn't exit successfully: `rustc --crate-name c --edition=2015 D:\a\cargo\cargo\target\tmp\cit\t1713\foo\c\src\lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg cfg(docsrs,test) --check-cfg "cfg(feature, values())" -C metadata=c5428bb539fd3662 -C extra-filename=-4a7368518b97c39c --out-dir D:\a\cargo\cargo\target\tmp\cit\t1713\foo\./target\debug\deps -L dependency=D:\a\cargo\cargo\target\tmp\cit\t1713\foo\./target\debug\deps --extern d=D:\a\cargo\cargo\target\tmp\cit\t1713\foo\./target\debug\deps\libd-4905d440739651d9.rmeta` (exit code: 0xc00000fd, STATUS_STACK_OVERFLOW)

@weihanglo weihanglo added this pull request to the merge queue Mar 26, 2025
Merged via the queue into rust-lang:master with commit 6344cad Mar 26, 2025
21 checks passed
@Berrysoft Berrysoft deleted the dev/cygwin branch March 26, 2025 05:35
@ehuss
Copy link
Contributor

ehuss commented Mar 26, 2025

@weihanglo Do you happen to know what job that was? Was it msvc or gnu?

@weihanglo
Copy link
Member

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2025
Update cargo

10 commits in 307cbfda3119f06600e43cd38283f4a746fe1f8b..a6c604d1b8a2f2a8ff1f3ba6092f9fda42f4b7e9
2025-03-20 20:00:39 +0000 to 2025-03-26 18:11:00 +0000
- fix(package): update tracking issue for `--message-format` (rust-lang/cargo#15354)
- docs(contrib): Expand the description of team meetings (rust-lang/cargo#15349)
- feat(package): add unstable `--message-format` flag  (rust-lang/cargo#15311)
- feat(complete): Added completion for `--profile` (rust-lang/cargo#15308)
- Uplift windows Cygwin DLL import libraries (rust-lang/cargo#15193)
- do not pass cdylib link args to test (rust-lang/cargo#15317)
- fix: revert the behavior checking lockfile's VCS status (rust-lang/cargo#15341)
- Temporarily ignore cargo_test_doctest_xcompile_ignores (rust-lang/cargo#15348)
- docs: fix typo in the "Shared cache" section (rust-lang/cargo#15346)
- Fix some issues with future-incompat report generation (rust-lang/cargo#15345)

r? ghost
@rustbot rustbot added this to the 1.87.0 milestone Mar 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cfg-expr Area: Platform cfg expressions O-windows OS: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants