diff options
| author | bors <bors@rust-lang.org> | 2016-02-06 21:18:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-06 21:18:50 +0000 |
| commit | 8c604dc940c35e4ac36012aa85375250f2e6e07e (patch) | |
| tree | f3beddb6caac90034b3410c7249745f1386e1dd2 /src/liballoc_system | |
| parent | 915fa2a378a22d197ed85f2d563f443edb10b713 (diff) | |
| parent | 7afb56f51e52030fbdda07c38f9ae09a1daeed9f (diff) | |
| download | rust-8c604dc940c35e4ac36012aa85375250f2e6e07e.tar.gz rust-8c604dc940c35e4ac36012aa85375250f2e6e07e.zip | |
Auto merge of #30629 - brson:emscripten-upstream, r=alexcrichton
Here's another go at adding emscripten support. This needs to wait again on new [libc definitions](https://github.com/rust-lang-nursery/libc/pull/122) landing. To get the libc definitions right I had to add support for i686-unknown-linux-musl, which are very similar to emscripten's, which are derived from arm/musl. This branch additionally removes the makefile dependency on the `EMSCRIPTEN` environment variable by not building the unused compiler-rt. Again, this is not sufficient for actually compiling to asmjs since it needs additional LLVM patches. r? @alexcrichton
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 8423492caf1..6a62e00d311 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -30,7 +30,8 @@ extern crate libc; target_arch = "arm", target_arch = "mips", target_arch = "powerpc", - target_arch = "powerpc64")))] + target_arch = "powerpc64", + target_arch = "asmjs")))] const MIN_ALIGN: usize = 8; #[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64")))] |