about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJorge Aparicio <jorge@japaric.io>2018-04-04 22:23:33 +0200
committerJorge Aparicio <jorge@japaric.io>2018-04-04 22:23:33 +0200
commitbca569f57c53e219270be72ed5976b8167fcd246 (patch)
treee8ba515d19b2914a654b2915d6fe285257fe8623 /src/bootstrap
parent14768f9b636ef345320ded41da5e9f3da7af3a81 (diff)
downloadrust-bca569f57c53e219270be72ed5976b8167fcd246.tar.gz
rust-bca569f57c53e219270be72ed5976b8167fcd246.zip
Revert "create a nostd crate"
This reverts commit 14768f9b636ef345320ded41da5e9f3da7af3a81.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/compile.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index a93b26ac2ba..eaf4ab272c6 100644
--- 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();