diff options
| author | bors <bors@rust-lang.org> | 2016-12-23 09:09:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-23 09:09:26 +0000 |
| commit | 99913c5ead4d4f82ecda525b5d6f25dfaf541517 (patch) | |
| tree | 7aed01c2e7d415dd69eb76fd862b1a4f1e392d63 /src/liballoc_jemalloc | |
| parent | 82611a022468bb54476f149a0e77901ed48bcb9a (diff) | |
| parent | 4dcb86767111149bcd233d6ac5c782d345d1e10b (diff) | |
| download | rust-99913c5ead4d4f82ecda525b5d6f25dfaf541517.tar.gz rust-99913c5ead4d4f82ecda525b5d6f25dfaf541517.zip | |
Auto merge of #38401 - redox-os:redox_cross, r=brson
Redox Cross Compilation I will admit - there are things here that I wish I did not have to do. This completes the ability to create a cross compiler from the rust repository for `x86_64-unknown-redox`. I will document this PR with inline comments explaining some things. [View this gist to see how a cross compiler is built](https://gist.github.com/jackpot51/6680ad973986e84d69c79854249f2b7e) Prior discussion of a smaller change is here: https://github.com/rust-lang/rust/pull/38366
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index 60b7875a97c..2bbec9e5fc2 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -36,7 +36,8 @@ fn main() { // targets, which means we have to build the alloc_jemalloc crate // for targets like emscripten, even if we don't use it. if target.contains("rumprun") || target.contains("bitrig") || target.contains("openbsd") || - target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") { + target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") || + target.contains("redox") { println!("cargo:rustc-cfg=dummy_jemalloc"); return; } |