about summary refs log tree commit diff
path: root/pkgs/development/compilers/rust
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2022-09-24 12:27:21 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-09-30 12:33:18 +1000
commit164865d98e94967c05fe90d20c896174f8a66262 (patch)
tree8cf27420304c0f3b8b876f0ea7c62d8c4f167719 /pkgs/development/compilers/rust
parent7170a03e5809e89275e3f41c3d498d39b8e6fa17 (diff)
downloadnixlib-164865d98e94967c05fe90d20c896174f8a66262.tar
nixlib-164865d98e94967c05fe90d20c896174f8a66262.tar.gz
nixlib-164865d98e94967c05fe90d20c896174f8a66262.tar.bz2
nixlib-164865d98e94967c05fe90d20c896174f8a66262.tar.lz
nixlib-164865d98e94967c05fe90d20c896174f8a66262.tar.xz
nixlib-164865d98e94967c05fe90d20c896174f8a66262.tar.zst
nixlib-164865d98e94967c05fe90d20c896174f8a66262.zip
Revert "Revert "rustc: build with jemalloc""
This reverts commit 539762709bb014f93f71dd825dc60003862c776f.

the x86_64-darwin on aarch64-darwin emulation issue was fixed by setting JEMALLOC_SYS_WITH_LG_VADDR
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 60ee42d4649b..ce0dcf1613bf 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -107,6 +107,9 @@ in stdenv.mkDerivation rec {
     "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
   ] ++ optionals stdenv.targetPlatform.isMusl [
     "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
+  ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    # https://github.com/rust-lang/rust/issues/92173
+    "--set rust.jemalloc"
   ];
 
   # The bootstrap.py will generated a Makefile that then executes the build.