diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-08-13 16:39:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-13 16:39:56 +0100 |
| commit | f08b424f73c7f81d5fd595f0e3e8940918bacd8e (patch) | |
| tree | 81be6de5514a12ad2dabdfa505a687a4962f2bd7 /pkgs/build-support | |
| parent | e971e4273b1446f1793174b84753baad35481dbc (diff) | |
| parent | a67c5f82c0558147c9310a45d2dd450095cc2a83 (diff) | |
Merge pull request #186443 from yu-re-ka/feature/rustc-musl2
fix pkgsMusl.rustc
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/hooks/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index d336924570771..652b074c30206 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -75,11 +75,8 @@ in { ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${shortTarget}"] "linker" = "${ccForHost}" - ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 - lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' - "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] - ''} ''} + "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] ''; }; } ./cargo-setup-hook.sh) {}; |