diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-01 18:42:07 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-01 18:42:07 +0200 |
| commit | 39a2b0b3bf1849354e033a8752e3eff484195ebc (patch) | |
| tree | aabdabc1ccbc3af7b81bad376247dd18ae206624 /pkgs/development/compilers/rust | |
| parent | f8b103122192de8026aae14c9db6d35aec741a1f (diff) | |
| download | nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar.gz nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar.bz2 nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar.lz nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar.xz nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.tar.zst nixlib-39a2b0b3bf1849354e033a8752e3eff484195ebc.zip | |
rust: remove aarch64-linux workaround
This commit reverts #209113, since aarch64-linux now uses GCC 12 by default.
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 722d963c4777..7cb6f22c949b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -54,9 +54,7 @@ in stdenv.mkDerivation rec { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib" - # https://github.com/NixOS/nixpkgs/issues/201254 - ++ optional (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"); + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; |