Revert "create a nostd crate"

This reverts commit 14768f9b636ef345320ded41da5e9f3da7af3a81.

diff --git a/src/Cargo.lock b/src/Cargo.lock
index 42ac9b3c49dee27e40d56970af521994949bcb6b..1f7cf84cedbdaad30ee8954cbc95d237fe6c3914 100644 (file)
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1081,16 +1081,6 @@ name = "nodrop"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "nostd"
-version = "0.0.0"
-dependencies = [
- "alloc 0.0.0",
- "compiler_builtins 0.0.0",
- "core 0.0.0",
- "std_unicode 0.0.0",
-]
-
 [[package]]
 name = "num"
 version = "0.1.42"

diff --git a/src/Cargo.toml b/src/Cargo.toml
index babf35d570b5174d739d6ccce93abd9de41216c6..814c054c51e41eaff3c6b155110474f8a252c3e8 100644 (file)
--- a/src/Cargo.toml
+++ b/src/Cargo.toml
@@ -2,7 +2,6 @@
 members = [
   "bootstrap",
   "rustc",
-  "libnostd",
   "libstd",
   "libtest",
   "librustc_trans",

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index a93b26ac2bae0d541de7116a51c95e07bcfb3115..eaf4ab272c68ef7defc36028a0cfde6331d69756 100644 (file)
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -145,10 +145,10 @@ pub fn std_cargo(build: &Builder,
     }
 
     if build.no_std(target) == Some(true) {
-        // for no-std targets we compile a minimal nostd crate that only depends on crates that work
-        // without an OS
-        cargo.arg("--manifest-path")
-            .arg(build.src.join("src/libnostd/Cargo.toml"));
+        // for no-std targets we only compile core and compiler-builtins
+        cargo.arg("--features").arg("c mem")
+            .arg("--manifest-path")
+            .arg(build.src.join("src/rustc/compiler_builtins_shim/Cargo.toml"));
     } else {
         let mut features = build.std_features();
 

diff --git a/src/libnostd/Cargo.toml b/src/libnostd/Cargo.toml
deleted file mode 100644 (file)
index 6919390..0000000
--- a/src/libnostd/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "nostd"
-version = "0.0.0"
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-lang/rust.git"
-description = "(not) The Rust Standard Library"
-
-[lib]
-name = "nostd"
-path = "lib.rs"
-
-[dependencies]
-alloc = { path = "../liballoc" }
-compiler_builtins = { path = "../rustc/compiler_builtins_shim", features = ["c", "mem"] }
-core = { path = "../libcore" }
-std_unicode = { path = "../libstd_unicode" }
\ No newline at end of file

diff --git a/src/libnostd/lib.rs b/src/libnostd/lib.rs
deleted file mode 100644 (file)
index d28afe2..0000000
--- a/src/libnostd/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![feature(staged_api)]
-#![no_std]
-#![unstable(feature = "nostd", issue = "0")]