summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-08-14 20:29:49 +0300
committerGitHub <noreply@github.com>2016-08-14 20:29:49 +0300
commit8ade28e9a26a27153bda67cd5213411bfbd95ff3 (patch)
tree972c008b61710f32382c2132641f7433048c2513 /src/bootstrap
parentc3cede2257424d3d1879618a784974b967491b9b (diff)
parent60599df03b094c81923ab863c6fd616ef2c15806 (diff)
downloadrust-8ade28e9a26a27153bda67cd5213411bfbd95ff3.tar.gz
rust-8ade28e9a26a27153bda67cd5213411bfbd95ff3.zip
Rollup merge of #35574 - badboy:emscripten-test-fixes, r=brson
Emscripten test fixes

This picks up parts of #31623 to disable certain tests that emscripten can't run, as threads/processes are not supported.
I re-applied @tomaka's changes manually, I can rebase those commits with his credentials if he wants.

It also disables jemalloc for emscripten (at least in Rustbuild, I have to check if there is another setting for the same thing in the old makefile approach).

This should not impact anything for normal builds.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/sanity.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 09f96782e71..d6ac3ef6c9c 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -98,7 +98,8 @@ pub fn check(build: &mut Build) {
         if target.contains("rumprun") ||
            target.contains("bitrig") ||
            target.contains("openbsd") ||
-           target.contains("msvc") {
+           target.contains("msvc") ||
+           target.contains("emscripten") {
             build.config.use_jemalloc = false;
         }