Skip to content

Commit bca569f

Browse files
committed
Revert "create a nostd crate"
This reverts commit 14768f9.
1 parent 14768f9 commit bca569f

File tree

5 files changed

+4
-35
lines changed

5 files changed

+4
-35
lines changed

src/Cargo.lock

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
members = [
33
"bootstrap",
44
"rustc",
5-
"libnostd",
65
"libstd",
76
"libtest",
87
"librustc_trans",

src/bootstrap/compile.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ pub fn std_cargo(build: &Builder,
145145
}
146146

147147
if build.no_std(target) == Some(true) {
148-
// for no-std targets we compile a minimal nostd crate that only depends on crates that work
149-
// without an OS
150-
cargo.arg("--manifest-path")
151-
.arg(build.src.join("src/libnostd/Cargo.toml"));
148+
// for no-std targets we only compile core and compiler-builtins
149+
cargo.arg("--features").arg("c mem")
150+
.arg("--manifest-path")
151+
.arg(build.src.join("src/rustc/compiler_builtins_shim/Cargo.toml"));
152152
} else {
153153
let mut features = build.std_features();
154154

src/libnostd/Cargo.toml

-17
This file was deleted.

src/libnostd/lib.rs

-3
This file was deleted.

0 commit comments

Comments
 (0)