Skip to content

Downgrade bundled jemalloc version #30985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2016
Merged

Downgrade bundled jemalloc version #30985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down Expand Up @@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion src/jemalloc
Open in desktop
Submodule jemalloc updated 102 files
2 changes: 1 addition & 1 deletion src/test/compile-fail/allocator-dylib-is-system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass/allocator-default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/allocator-jemalloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down