diff --git a/Cargo.lock b/Cargo.lock index a2e729a..a337ce5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,15 +22,22 @@ dependencies = [ "redox_uefi_alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rlibc" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "system76_firmware_smmstore" version = "1.0.0" dependencies = [ "redox_uefi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_uefi_std 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] "checksum redox_uefi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dafc50645c27c55ca19d27645a6d91e2a8cbc7aabb2ed024ce914512c75e1217" "checksum redox_uefi_alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72e7224e2106fdc2a35a33e38825f4867c3566671dc496fb67b992d05328e564" "checksum redox_uefi_std 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ead5c13a8a650646b2f93065002d65b45226cdbc6494b0ac4aaed30ce9b17c7f" +"checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" diff --git a/Cargo.toml b/Cargo.toml index 69914b9..fd48315 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,4 @@ crate-type = ["staticlib"] [dependencies] redox_uefi = "0.1.0" redox_uefi_std = "0.1.0" - -[package.metadata.cargo-xbuild] -memcpy = true -sysroot_path = "build/xbuild" +rlibc = "1.0" diff --git a/Makefile b/Makefile index 8c3f1c7..42cfe77 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,8 @@ $(BUILD)/boot.o: $(BUILD)/boot.a $(BUILD)/boot.a: Cargo.lock Cargo.toml res/* src/* mkdir -p $(BUILD) - cargo xrustc \ + cargo rustc \ + -Z build-std=core,alloc \ --lib \ --target $(TARGET) \ --release \ diff --git a/src/lib.rs b/src/lib.rs index 1c07a53..3c93245 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,6 +4,7 @@ #![feature(try_trait)] #![allow(non_snake_case)] +extern crate rlibc; #[macro_use] extern crate uefi_std as std;