mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Downgrade bundled jemalloc version
We've been seeing a lot of timeouts in tests on the bots and investigation ended pointing to jemalloc/jemalloc#315 as the culprit. Unfortunately it looks like that doesn't seem to have a fix on the way soon, so let's temporarily downgrade back to the previous version of jemalloc we were using (where #30434 was the most recent upgrade)
This commit is contained in:
parent
bff52927f5
commit
884de56f71
9
configure
vendored
9
configure
vendored
@ -550,7 +550,7 @@ CFG_SELF="$0"
|
|||||||
CFG_CONFIGURE_ARGS="$@"
|
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"
|
err "The path to the rust source directory contains spaces, which is not supported"
|
||||||
;;
|
;;
|
||||||
@ -892,6 +892,13 @@ then
|
|||||||
CFG_DISABLE_JEMALLOC=1
|
CFG_DISABLE_JEMALLOC=1
|
||||||
fi
|
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
|
# 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.
|
# 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" ]
|
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f84e30927284b0c500ed3eaf09e8e159da20ddaf
|
Subproject commit e24a1a025a1f214e40eedafe3b9c7b1d69937922
|
@ -8,7 +8,7 @@
|
|||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// 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-musl no dylibs on musl yet
|
||||||
// ignore-bitrig no jemalloc on bitrig
|
// ignore-bitrig no jemalloc on bitrig
|
||||||
// ignore-openbsd no jemalloc on openbsd
|
// ignore-openbsd no jemalloc on openbsd
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// 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-musl no dylibs on musl right now
|
||||||
// ignore-bitrig no jemalloc on bitrig
|
// ignore-bitrig no jemalloc on bitrig
|
||||||
// ignore-openbsd no jemalloc on openbsd
|
// ignore-openbsd no jemalloc on openbsd
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
|
|
||||||
#![feature(alloc_jemalloc, alloc_system)]
|
#![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;
|
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;
|
extern crate alloc_system;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// no-prefer-dynamic
|
// no-prefer-dynamic
|
||||||
// ignore-msvc no jemalloc on msvc
|
// ignore-windows no jemalloc on windows
|
||||||
// ignore-bitrig no jemalloc on bitrig
|
// ignore-bitrig no jemalloc on bitrig
|
||||||
// ignore-openbsd no jemalloc on openbsd
|
// ignore-openbsd no jemalloc on openbsd
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user