diff options
| author | bors <bors@rust-lang.org> | 2016-03-07 22:49:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-07 22:49:37 +0000 |
| commit | e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3 (patch) | |
| tree | 1e67584b82b9f652f8bb1cc7e387746499288a0a /src/libstd/os/mod.rs | |
| parent | 388ccda455140e51456980efc07d175c19dcf005 (diff) | |
| parent | 660bbf4f6f4ce7a3d9e4fa7fdfc5e7c87145e049 (diff) | |
| download | rust-tmp.tar.gz | |
Auto merge of #31986 - ashleysommer:emscripten_fixes, r=alexcrichtontmp
The main cause of the problem is that libstd/os/mod.rs treats emscripten targets as an alias of linux targets, whereas liblibc treats emscripten targets as musl-compliant, so it gets a slightly different struct stat64 defined.
This commit adds conditional compilation checks to use the correct timestamp format on fs metadata functions in the case of compiling to emscripten targets.
This commit also depends needs https://github.com/ashleysommer/rust/commit/f1575cff2d631e977038fdba3fa3422ba5f8f2fe applied in order to successfully build libstd with emscripten target.
Diffstat (limited to 'src/libstd/os/mod.rs')
| -rw-r--r-- | src/libstd/os/mod.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs index 72baa4abb26..a91d251fc12 100644 --- a/src/libstd/os/mod.rs +++ b/src/libstd/os/mod.rs @@ -31,10 +31,6 @@ pub use sys::ext as windows; #[cfg(target_os = "netbsd")] pub mod netbsd; #[cfg(target_os = "openbsd")] pub mod openbsd; #[cfg(target_os = "solaris")] pub mod solaris; - -// Emscripten is just like linux -#[cfg(target_os = "emscripten")] -#[path = "linux/mod.rs"] -pub mod emscripten; +#[cfg(target_os = "emscripten")] pub mod emscripten; pub mod raw; |