diff options
| -rw-r--r-- | .builds/x86_64.yml | 1 | ||||
| -rw-r--r-- | .cargo/config.toml | 3 | ||||
| -rw-r--r-- | Cargo.toml | 8 | ||||
| -rw-r--r-- | Makefile | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/.builds/x86_64.yml b/.builds/x86_64.yml index 4168b03..7445364 100644 --- a/.builds/x86_64.yml +++ b/.builds/x86_64.yml @@ -13,7 +13,6 @@ tasks: cd rustubs rustup default nightly rustup component add rust-src - cargo install cargo-xbuild - build: | cd rustubs mkdir build diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..2abd771 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,3 @@ +[unstable] +build-std = ["core","alloc", "compiler_builtins"] +build-std-features = ["compiler-builtins-mem"] @@ -9,18 +9,10 @@ license = "eupl-1.2" spin = "0.9.8" bitflags = "2.4.2" -# rebuild components, instead of using the prebuilt ones. -# see https://os.phil-opp.com/heap-allocation/#the-allocator-interface -# [unstable] -# build-std = ["core", "compiler_builtins", "alloc"] - [dependencies.lazy_static] version = "1.4" features = ["spin_no_std"] -# [build] -# target = "x86_64-rustubs" - [lib] crate-type = ["staticlib"] @@ -66,7 +66,7 @@ $(BUILD)/_%.o : %.s | $(BUILD) # define this, the linker will have troubles, especially when we use a "no_std" build rust_kernel: check @echo "---BUILDING RUST KERNEL---" - @RUSTFLAGS="$(RUSTC_FLAGS)" cargo xbuild --target $(CARGO_XBUILD_TARGET) $(CARGO_XBUILD_FLAGS) + RUSTFLAGS="$(RUSTC_FLAGS)" cargo build --target $(CARGO_XBUILD_TARGET) $(CARGO_XBUILD_FLAGS) # need nasm # TODO make this arch dependent |