diff options
| author | bors <bors@rust-lang.org> | 2017-06-20 07:22:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-20 07:22:38 +0000 |
| commit | 753fee4ab69e71185b3903bad383dd5418e97895 (patch) | |
| tree | 822ee160eb43c6ed0b530bc8dfde9bc0e8631b86 /src/liballoc_jemalloc | |
| parent | 1143eb26a2e405cdccbf6789c89d4581ad969868 (diff) | |
| parent | be7ebdd512e8b4de29c0e0cf5aabf486e988867b (diff) | |
| download | rust-753fee4ab69e71185b3903bad383dd5418e97895.tar.gz rust-753fee4ab69e71185b3903bad383dd5418e97895.zip | |
Auto merge of #42495 - alexcrichton:new-stage0, r=Mark-Simulacrum
Bump to 1.20.0 and update stage0 compiler Betas are hot off the bots, let's get them while they're fresh.
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index f3a0eebe698..23677bca9f1 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -154,6 +154,11 @@ fn main() { make.current_dir(&native.out_dir) .arg("build_lib_static"); + // These are intended for mingw32-make which we don't use + if cfg!(windows) { + make.env_remove("MAKEFLAGS").env_remove("MFLAGS"); + } + // mingw make seems... buggy? unclear... if !host.contains("windows") { make.arg("-j") |