diff options
| author | bors <bors@rust-lang.org> | 2016-09-16 04:01:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 04:01:01 -0700 |
| commit | 8394685b8385156fc4bc31cfbc693867e276d9d7 (patch) | |
| tree | 1ce201fd010be57e767bd462e67aeaef50c9deb8 /src/rustc | |
| parent | 89500e934134d19b09e51a1f45430ded65e291b4 (diff) | |
| parent | 5841678f51b9fcb085dba148639a21d95ef91423 (diff) | |
| download | rust-8394685b8385156fc4bc31cfbc693867e276d9d7.tar.gz rust-8394685b8385156fc4bc31cfbc693867e276d9d7.zip | |
Auto merge of #36441 - alexcrichton:rustbuild-target, r=brson
rustbuild: Fix cross-compiles to MinGW on Linux Closes #36290 Closes #36291
Diffstat (limited to 'src/rustc')
| -rw-r--r-- | src/rustc/std_shim/Cargo.lock | 1 | ||||
| -rw-r--r-- | src/rustc/std_shim/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/rustc/std_shim/lib.rs | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/rustc/std_shim/Cargo.lock b/src/rustc/std_shim/Cargo.lock index 747322b32f3..b4602355457 100644 --- a/src/rustc/std_shim/Cargo.lock +++ b/src/rustc/std_shim/Cargo.lock @@ -2,6 +2,7 @@ name = "std_shim" version = "0.1.0" dependencies = [ + "core 0.0.0", "std 0.0.0", ] diff --git a/src/rustc/std_shim/Cargo.toml b/src/rustc/std_shim/Cargo.toml index 693cbe06ba9..58a7bd8a1cb 100644 --- a/src/rustc/std_shim/Cargo.toml +++ b/src/rustc/std_shim/Cargo.toml @@ -41,6 +41,7 @@ debug-assertions = false [dependencies] std = { path = "../../libstd" } +core = { path = "../../libcore" } # Reexport features from std [features] diff --git a/src/rustc/std_shim/lib.rs b/src/rustc/std_shim/lib.rs index 3cf4cfab135..2fc5d8d6e53 100644 --- a/src/rustc/std_shim/lib.rs +++ b/src/rustc/std_shim/lib.rs @@ -9,3 +9,9 @@ // except according to those terms. // See comments in Cargo.toml for why this exists + +// There's a bug right now where if we pass --extern std=... and we're cross +// compiling then this doesn't work with `#[macro_use] extern crate std;`. Work +// around this by not having `#[macro_use] extern crate std;` +#![no_std] +extern crate std; |