diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-03-03 14:23:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 14:23:20 +0000 |
| commit | b44213aac1289bc3fe92065574a588d44a764a99 (patch) | |
| tree | 71e7573e83015e5122f25f505d50a46ddfc7f970 /pkgs/build-support/rust | |
| parent | 595d55c8a96aced74c1463d7e07994510907b4a8 (diff) | |
| parent | 11b07d930ddab70c3a82234fe83ed5d649b2ac52 (diff) | |
Merge pull request #219011 from wegank/rust-cleanup
rust, firefox, spidermonkey: cleanup
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/hooks/cargo-setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/hooks/default.nix | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 90a81d68b5200..bdd9db8766fa7 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -1,8 +1,6 @@ cargoSetupPostUnpackHook() { echo "Executing cargoSetupPostUnpackHook" - export NIX_LDFLAGS+=" @aarch64LinuxGccWorkaround@" - # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes # it writable. If we're using a tarball, the unpackFile hook already handles diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index b4034120103ed..168224e39b359 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -108,9 +108,6 @@ in { host-config = true target-applies-to-host = true ''; - - # https://github.com/NixOS/nixpkgs/issues/201254 - aarch64LinuxGccWorkaround = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; }; } ./cargo-setup-hook.sh) {}; |