diff options
| -rwxr-xr-x | configure | 9 | ||||
| m--------- | src/jemalloc | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-dylib-is-system.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-jemalloc.rs | 2 |
6 files changed, 13 insertions, 6 deletions
diff --git a/configure b/configure index 287b7b35219..446a6e3feae 100755 --- a/configure +++ b/configure @@ -550,7 +550,7 @@ CFG_SELF="$0" CFG_CONFIGURE_ARGS="$@" -case "${CFG_SRC_DIR}" in +case "${CFG_SRC_DIR}" in *\ * ) err "The path to the rust source directory contains spaces, which is not supported" ;; @@ -892,6 +892,13 @@ then CFG_DISABLE_JEMALLOC=1 fi +if [ $CFG_OSTYPE = pc-windows-gnu ] +then + # FIXME(#31030) - there's not a great reason to disable jemalloc here + step_msg "on Windows, disabling jemalloc" + CFG_DISABLE_JEMALLOC=1 +fi + # OS X 10.9, gcc is actually clang. This can cause some confusion in the build # system, so if we find that gcc is clang, we should just use clang directly. if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ] diff --git a/src/jemalloc b/src/jemalloc -Subproject f84e30927284b0c500ed3eaf09e8e159da20dda +Subproject e24a1a025a1f214e40eedafe3b9c7b1d6993792 diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index b862fc1a1f4..5f8948ac5f1 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-msvc everything is the system allocator on msvc +// ignore-windows everything is the system allocator on windows // ignore-musl no dylibs on musl yet // ignore-bitrig no jemalloc on bitrig // ignore-openbsd no jemalloc on openbsd diff --git a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs index e75cb2a75cf..b29797f3295 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-msvc everything is the system allocator on msvc +// ignore-windows everything is the system allocator on windows // ignore-musl no dylibs on musl right now // ignore-bitrig no jemalloc on bitrig // ignore-openbsd no jemalloc on openbsd diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 52ad8b17093..aed7e5a8c13 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -10,9 +10,9 @@ #![feature(alloc_jemalloc, alloc_system)] -#[cfg(not(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd")))] +#[cfg(not(any(windows, target_os = "bitrig", target_os = "openbsd")))] extern crate alloc_jemalloc; -#[cfg(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd"))] +#[cfg(any(windows, target_os = "bitrig", target_os = "openbsd"))] extern crate alloc_system; fn main() { diff --git a/src/test/run-pass/allocator-jemalloc.rs b/src/test/run-pass/allocator-jemalloc.rs index c8a9aeb706e..3744aafdc5b 100644 --- a/src/test/run-pass/allocator-jemalloc.rs +++ b/src/test/run-pass/allocator-jemalloc.rs @@ -9,7 +9,7 @@ // except according to those terms. // no-prefer-dynamic -// ignore-msvc no jemalloc on msvc +// ignore-windows no jemalloc on windows // ignore-bitrig no jemalloc on bitrig // ignore-openbsd no jemalloc on openbsd |