diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-23 22:31:28 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 22:31:28 -0700 |
| commit | 4856efb7046809184778f6d9c59e6e6f3e81b74f (patch) | |
| tree | c4ffac870613b2a519d704907bef466ad6bbbe04 /pkgs/development/compilers | |
| parent | 5856e44258166d261698aae54c3992e87c495fe1 (diff) | |
| download | nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar.gz nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar.bz2 nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar.lz nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar.xz nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.tar.zst nixlib-4856efb7046809184778f6d9c59e6e6f3e81b74f.zip | |
rustc: Disable system jemalloc until we can make it compatible
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rustc/generic.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 8b3c61d52715..2dc91cb5ec4c 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] - ++ [ "--llvm-root=${llvmPackages_37.llvm}" "--jemalloc-root=${jemalloc}/lib" ] + ++ [ "--llvm-root=${llvmPackages_37.llvm}" ] #"--jemalloc-root=${jemalloc}/lib" ] ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"; @@ -139,8 +139,9 @@ stdenv.mkDerivation { -e '/probe_need CFG_CURLORWGET/d' # Fix the use of jemalloc prefixes which our jemalloc doesn't have - [ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs - [ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ + # TODO: reenable if we can figure out how to get our jemalloc to work + #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs + #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Useful debugging parameter #export VERBOSE=1 |