From bca569f57c53e219270be72ed5976b8167fcd246 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 4 Apr 2018 22:23:33 +0200 Subject: Revert "create a nostd crate" This reverts commit 14768f9b636ef345320ded41da5e9f3da7af3a81. --- src/bootstrap/compile.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/bootstrap') 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(); -- cgit 1.4.1-3-g733a5