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/emscripten/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/emscripten/mod.rs')
| -rw-r--r-- | src/libstd/os/emscripten/mod.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/libstd/os/emscripten/mod.rs b/src/libstd/os/emscripten/mod.rs new file mode 100644 index 00000000000..8ec44b9fae4 --- /dev/null +++ b/src/libstd/os/emscripten/mod.rs @@ -0,0 +1,16 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +//! Linux-specific definitions + +#![stable(feature = "raw_ext", since = "1.1.0")] + +pub mod raw; +pub mod fs; |
