diff options
| author | bors <bors@rust-lang.org> | 2013-12-26 11:36:37 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-26 11:36:37 -0800 |
| commit | f74b8f0d3a90fd3b64afa38b9470d9a45cd04ee9 (patch) | |
| tree | c5076a8b6b18f7cf7bb88b7f55546f7d8f9b2a8a /src/libstd | |
| parent | 1f34f50ce6a2b5a9c045df21b9147d61cc54b6cd (diff) | |
| parent | ab431a20c0fe3f00f3d124200d10e13877dcf20b (diff) | |
| download | rust-f74b8f0d3a90fd3b64afa38b9470d9a45cd04ee9.tar.gz rust-f74b8f0d3a90fd3b64afa38b9470d9a45cd04ee9.zip | |
auto merge of #11148 : alexcrichton/rust/snapshots, r=luqmana
C++ is gone for good and `crate_id` is the new `pkgid`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rtdeps.rs | 25 |
2 files changed, 0 insertions, 27 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 4f633a63bab..442c7f3f856 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -43,8 +43,6 @@ //! //! use std::prelude::*; -// NOTE: remove after snapshot -#[pkgid = "std#0.9-pre"]; #[crate_id = "std#0.9-pre"]; #[comment = "The Rust standard library"]; #[license = "MIT/ASL2"]; diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs index 01d163f49e0..1ecfc1f25d0 100644 --- a/src/libstd/rtdeps.rs +++ b/src/libstd/rtdeps.rs @@ -43,28 +43,3 @@ extern {} #[cfg(target_os = "macos")] #[link(name = "pthread")] extern {} - -// NOTE: remove after snapshot -// stage0-generated code still depends on c++ -#[cfg(stage0)] -mod stage0 { - #[cfg(target_os = "linux")] - #[link(name = "stdc++")] - extern {} - - #[cfg(target_os = "android")] - #[link(name = "supc++")] - extern {} - - #[cfg(target_os = "freebsd")] - #[link(name = "stdc++")] - extern {} - - #[cfg(target_os = "macos")] - #[link(name = "stdc++")] - extern {} - - #[cfg(target_os = "win32")] - #[link(name = "stdc++")] - extern {} -} |