Revert "create a nostd crate"

This reverts commit 14768f9.
rust-lang · Apr 4, 2018 · bca569f · bca569f
1 parent 14768f9
commit bca569f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 35 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git 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
@@ -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
diff --git a/src/libnostd/lib.rs b/src/libnostd/lib.rs