about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJorge Aparicio <jorge@japaric.io>2018-04-04 19:24:57 +0200
committerJorge Aparicio <jorge@japaric.io>2018-04-04 19:24:57 +0200
commit14768f9b636ef345320ded41da5e9f3da7af3a81 (patch)
tree8ac8ad28fa7d3a0607ede928ebd7eb76b5068dac /src/bootstrap
parent862c839fb9e0ad5615443b7e8fa21b421e2e74eb (diff)
downloadrust-14768f9b636ef345320ded41da5e9f3da7af3a81.tar.gz
rust-14768f9b636ef345320ded41da5e9f3da7af3a81.zip
create a nostd crate
the goal is to build, in a single Cargo invocation, several no-std crates that we want to put in the
rust-std component of no-std targets. The nostd crate builds these crates:

- core
- compiler-builtin (with the "c" and "mem" features enabled)
- alloc
- std_unicode
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 eaf4ab272c6..a93b26ac2ba 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 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"));
+        // 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"));
     } else {
         let mut features = build.std_features();