Skip to content

llvmPackages.libunwind: add fake libgcc#330037

Merged
RossComputerGuy merged 1 commit intoNixOS:masterfrom
ExpidusOS:fix/pkgsllvm/rustc-wrapper
May 8, 2025
Merged

llvmPackages.libunwind: add fake libgcc#330037
RossComputerGuy merged 1 commit intoNixOS:masterfrom
ExpidusOS:fix/pkgsllvm/rustc-wrapper

Conversation

@RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Jul 26, 2024

Description of changes

Follow up to #320432

This is necessary to get some rust packages building with LLVM, notably mesa.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Jul 26, 2024
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch 5 times, most recently from b1d7c36 to 751864f Compare July 26, 2024 01:54
@ofborg ofborg bot requested review from Mic92 and tjni July 26, 2024 04:43
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 26, 2024
@RossComputerGuy RossComputerGuy marked this pull request as draft August 3, 2024 02:24
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch from 751864f to e99b72c Compare August 3, 2024 02:28
@RossComputerGuy RossComputerGuy changed the base branch from master to staging August 3, 2024 02:28
@RossComputerGuy RossComputerGuy marked this pull request as ready for review August 3, 2024 02:29
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch from e99b72c to 02551bf Compare August 3, 2024 02:43
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Sep 16, 2024

rusti-cal builds, mesa which this is mainly needed for doesn't build until the deps are fixed.

Mic92
Mic92 reviewed Sep 16, 2024
View reviewed changes
pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh Outdated
Copy link
Member

@Mic92 Mic92 Sep 16, 2024

Choose a reason for hiding this comment

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

NIX_LDFLAGS_@suffixSalt@ is sometimes used for cross compiling, but it's not clear to me if we need it here.

Copy link
Member Author

@RossComputerGuy RossComputerGuy Sep 16, 2024

Choose a reason for hiding this comment

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

Yeah, I can't tell either. Maybe it'll be good to check how CC wrapper works and see if this could affect cross compiled LLVM Rust packages and if it does then add the suffix?

Copy link
Member

@Mic92 Mic92 Sep 16, 2024

Choose a reason for hiding this comment

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

@Ericson2314 probably knows. But not sure if his GitHub feed is too swamped as well.

Copy link
Contributor

@tomberek tomberek Sep 23, 2024

Choose a reason for hiding this comment

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

Is this a blocker or can it be resolved later?

Copy link
Member

@Mic92 Mic92 Feb 6, 2025

Choose a reason for hiding this comment

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

Not if nix-build -A tests.rust-hooks still succeeds.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 10, 2024
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch 2 times, most recently from 4ad8701 to 38a1443 Compare January 2, 2025 22:08
@github-actions github-actions bot removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 2, 2025
@RossComputerGuy RossComputerGuy removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 2, 2025
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch 2 times, most recently from 6cd78d3 to 195ebac Compare January 2, 2025 22:58
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 18, 2025
@RossComputerGuy RossComputerGuy marked this pull request as draft April 18, 2025 21:06
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch from 18b9e2f to 9972ad4 Compare April 18, 2025 21:08
@RossComputerGuy RossComputerGuy changed the base branch from staging to master April 18, 2025 21:08
@RossComputerGuy RossComputerGuy marked this pull request as ready for review April 18, 2025 21:08
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Apr 18, 2025
@RossComputerGuy RossComputerGuy changed the title wrapRustcWith: fix linking with libgcc_s with llvm llvmPackages.libunwind: add fake libgcc Apr 18, 2025
alyssais
alyssais approved these changes Apr 26, 2025
View reviewed changes
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Makes sense to me. Up to you whether it makes sense to merge before #329995 is sorted.

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 26, 2025

Not sure how that PR is related but I'll sort out that PR after this one is merged. I have some ideas to improve things.

@alyssais
Copy link
Member

alyssais commented Apr 26, 2025

You mentioned it in #330037 (comment).

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 26, 2025

Oh yeah, both PR's are needed so musl builds.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 26, 2025
@RossComputerGuy RossComputerGuy requested a review from getchoo May 5, 2025 12:12
@RossComputerGuy RossComputerGuy force-pushed the fix/pkgsllvm/rustc-wrapper branch from 9972ad4 to 4f84312 Compare May 7, 2025 14:43
@RossComputerGuy RossComputerGuy merged commit 6814b2f into NixOS:master May 8, 2025
28 checks passed
@RossComputerGuy RossComputerGuy deleted the fix/pkgsllvm/rustc-wrapper branch May 8, 2025 04:07
@greg-hellings
Copy link
Contributor

greg-hellings commented Jun 19, 2025

So this broke the cross-compile target for pkgsCross.ucrtAarch64. Windows keeps its shared libraries under /bin with .dll extensions so this code creates broken symlinks.

I've opened #418054 to try and fix that.

@greg-hellings greg-hellings mentioned this pull request Jun 19, 2025
Open
13 tasks
@RossComputerGuy RossComputerGuy mentioned this pull request Jul 28, 2025
Merged
13 tasks
@ccicnce113424 ccicnce113424 mentioned this pull request Jul 31, 2025
Merged
13 tasks
OPNA2608
OPNA2608 reviewed Sep 14, 2025
View reviewed changes
pkgs/development/compilers/llvm/common/libunwind/default.nix
python3,
libcxx,
enableShared ? !stdenv.hostPlatform.isStatic,
doFakeLibgcc ? stdenv.hostPlatform.useLLVM,
Copy link
Contributor

@OPNA2608 OPNA2608 Sep 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This should also depend on enableShared I think? Otherwise this produces broken symlinks when building it as a static library, because there will be no $out/lib/libunwind.so to link to.

Copy link
Member

@alyssais alyssais Sep 21, 2025

Choose a reason for hiding this comment

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

#431439

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mic92 Mic92 Mic92 left review comments

@tomberek tomberek tomberek left review comments

@alyssais alyssais alyssais approved these changes

@OPNA2608 OPNA2608 OPNA2608 left review comments

@zowoq zowoq Awaiting requested review from zowoq

@winterqt winterqt Awaiting requested review from winterqt

@figsoda figsoda Awaiting requested review from figsoda

@tjni tjni Awaiting requested review from tjni

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@dtzWill dtzWill Awaiting requested review from dtzWill

@rrbutani rrbutani Awaiting requested review from rrbutani

@lovek323 lovek323 Awaiting requested review from lovek323

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@getchoo getchoo Awaiting requested review from getchoo

+1 more reviewer

@mildsunrise mildsunrise mildsunrise left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@RossComputerGuy @Mic92 @nixos-discourse @alyssais @greg-hellings @tomberek @mildsunrise @OPNA2608 @getchoo @wegank