bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #14858 : alexcrichton/rust/no-jemalloc-on-travis, r=thestinger

Browse source 
Turns out they don't have the `je_` prefix, so we can't use the system-installed
jemalloc.
This commit is contained in:
bors 2014-06-13 04:22:01 +00:00
commit 5d9bceb144
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -12,7 +12,6 @@ install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq --force-yes -y llvm-$LLVM_VERSION - sudo apt-get install -qq --force-yes -y llvm-$LLVM_VERSION
llvm-${LLVM_VERSION}-dev clang-$LLVM_VERSION lldb-$LLVM_VERSION llvm-${LLVM_VERSION}-dev clang-$LLVM_VERSION lldb-$LLVM_VERSION
libjemalloc-dev
# All of the llvm tools are suffixed with "-$VERS" which we don't want, so # All of the llvm tools are suffixed with "-$VERS" which we don't want, so
@ -29,7 +28,7 @@ before_script:
- ln -nsf /usr/bin/llc-$LLVM_VERSION local-llvm/bin/llc - ln -nsf /usr/bin/llc-$LLVM_VERSION local-llvm/bin/llc
- ln -nsf /usr/include/llvm-$LLVM_VERSION local-llvm/include - ln -nsf /usr/include/llvm-$LLVM_VERSION local-llvm/include
- ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm
--enable-fast-make --enable-clang --jemalloc-root=/usr/lib --enable-fast-make --enable-clang
# Tidy everything up first, then build a few things, and then run a few tests. # Tidy everything up first, then build a few things, and then run a few tests.
# Note that this is meant to run in a "fairly small" amount of time, so this # Note that this is meant to run in a "fairly small" amount of time, so this