Skip to content

Commit 1b3edea

Browse files
crawfxrdjackpot51
authored andcommitted
Replace cargo-xbuild with build-std
1 parent 6080ff9 commit 1b3edea

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name = "system76_firmware_update"
33
version = "1.0.0"
44
edition = "2018"
55

6-
[package.metadata.cargo-xbuild]
7-
memcpy = true
8-
sysroot_path = "build/xbuild"
9-
106
[lib]
117
name = "system76_firmware_update"
128
path = "src/lib.rs"
@@ -20,6 +16,7 @@ redox_dmi = "0.1.5"
2016
redox_hwio = "0.1.0"
2117
redox_uefi = "0.1.0"
2218
redox_uefi_std = "0.1.1"
19+
rlibc = "1.0"
2320
system76_ecflash = { git = "https://github.com/system76/ecflash.git" }
2421
system76_ectool = { git = "https://github.com/system76/ec.git" }
2522

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ $(BUILD)/boot.o: $(BUILD)/boot.a
7676
$(BUILD)/boot.a: Cargo.lock Cargo.toml src/* src/*/*
7777
mkdir -p $(BUILD)
7878
rustup component add rust-src
79-
cargo xrustc \
79+
cargo rustc \
80+
-Z build-std=core,alloc \
8081
--lib \
8182
--target $(TARGET) \
8283
--release \

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![feature(try_trait)]
77

88
extern crate alloc;
9-
9+
extern crate rlibc;
1010
#[macro_use]
1111
extern crate uefi_std as std;
1212

0 commit comments

Comments
 (0)