Skip to content

Commit 2c59b47

Browse files
committed
Don't explicitly require compiler-builtins(-mem)
They are implicit on uefi as of rust-lang/compiler-builtins#473.
1 parent 5fbf98f commit 2c59b47

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

book/src/tutorial/building.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ Run this command to build the application:
2424

2525
```sh
2626
cargo build --target x86_64-unknown-uefi \
27-
-Zbuild-std=core,compiler_builtins,alloc \
28-
-Zbuild-std-features=compiler-builtins-mem
27+
-Zbuild-std=core,alloc
2928
```
3029

3130
This will produce an x86-64 executable:
@@ -49,8 +48,7 @@ Create `.cargo/config.toml` with these contents:
4948
target = "x86_64-unknown-uefi"
5049

5150
[unstable]
52-
build-std = ["core", "compiler_builtins", "alloc"]
53-
build-std-features = ["compiler-builtins-mem"]
51+
build-std = ["core", "alloc"]
5452
```
5553

5654
Now you can build much more simply:

template/.cargo/config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[unstable]
2-
build-std = ["core", "compiler_builtins", "alloc"]
3-
build-std-features = ["compiler-builtins-mem"]
2+
build-std = ["core", "alloc"]

xtask/src/cargo.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ impl Cargo {
224224
cmd.args([
225225
"--target",
226226
target.as_triple(),
227-
"-Zbuild-std=core,compiler_builtins,alloc",
228-
"-Zbuild-std-features=compiler-builtins-mem",
227+
"-Zbuild-std=core,alloc",
229228
]);
230229
}
231230

0 commit comments

Comments
 (0)