diff options
| author | Dave Huseby <dhuseby@mozilla.com> | 2015-04-02 17:27:19 -0700 |
|---|---|---|
| committer | Dave Huseby <dhuseby@mozilla.com> | 2015-04-03 08:54:08 -0700 |
| commit | 787c6cda00f45de8634052b743b384f1fdaee7e0 (patch) | |
| tree | 0ac94894a0ce319d295d6d5d5e8834f9d34a0cba | |
| parent | 2615106a46879c4e9acc46874ebe06b549d06d67 (diff) | |
| download | rust-787c6cda00f45de8634052b743b384f1fdaee7e0.tar.gz rust-787c6cda00f45de8634052b743b384f1fdaee7e0.zip | |
this correctly disables jemalloc on Bitrig
| -rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure index ca73c1cf8b1..1c0911314b2 100755 --- a/configure +++ b/configure @@ -545,7 +545,6 @@ opt verify-install 1 "verify installed binaries work" # This is used by the automation to produce single-target nightlies opt dist-host-only 0 "only install bins for the host architecture" opt inject-std-version 1 "inject the current compiler version of libstd into programs" -opt jemalloc 1 "build liballoc with jemalloc" opt llvm-version-check 1 "don't check if the LLVM version is supported, build anyway" valopt localstatedir "/var/lib" "local state directory" @@ -562,6 +561,7 @@ valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path" # (others are conditionally saved). opt_nosave manage-submodules 1 "let the build manage the git submodules" opt_nosave clang 0 "prefer clang to gcc for building the runtime" +opt_nosave jemalloc 1 "build liballoc with jemalloc" valopt_nosave prefix "/usr/local" "set installation prefix" valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary" @@ -775,7 +775,7 @@ if [ $CFG_OSTYPE = unknown-bitrig ] then step_msg "on Bitrig, forcing use of clang, disabling jemalloc" CFG_ENABLE_CLANG=1 - CFG_ENABLE_JEMALLOC=0 + CFG_DISABLE_JEMALLOC=1 fi if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] @@ -828,6 +828,12 @@ then putvar CFG_ENABLE_CLANG fi +# Same with jemalloc. save the setting here. +if [ ! -z "$CFG_DISABLE_JEMALLOC" ] +then + putvar CFG_DISABLE_JEMALLOC +fi + if [ ! -z "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ] then step_msg "using custom LLVM at $CFG_LLVM_ROOT" |