rustc: Disable system jemalloc until we can make it compatible
This commit is contained in:
parent
5856e44258
commit
4856efb704
|
@ -115,7 +115,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
configureFlags = configureFlags
|
configureFlags = configureFlags
|
||||||
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
|
++ [ "--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" ]
|
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ]
|
||||||
++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
|
++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
|
||||||
|
|
||||||
|
@ -139,8 +139,9 @@ stdenv.mkDerivation {
|
||||||
-e '/probe_need CFG_CURLORWGET/d'
|
-e '/probe_need CFG_CURLORWGET/d'
|
||||||
|
|
||||||
# Fix the use of jemalloc prefixes which our jemalloc doesn't have
|
# 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
|
# TODO: reenable if we can figure out how to get our jemalloc to work
|
||||||
[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
|
#[ -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
|
# Useful debugging parameter
|
||||||
#export VERBOSE=1
|
#export VERBOSE=1
|
||||||
|
|
Loading…
Reference in a new issue