Makefile

@@ -1,9 +1,6 @@
 # Configuration and variables
 include mk/config.mk
 
-# Dependencies
-include mk/depends.mk
-
 all: build/harddrive.bin
 
 coreboot: build/coreboot.elf

mk/depends.mk

@@ -1,19 +0,0 @@
-# Dependencies
-
-ifeq ($(shell which rustup),)
-$(error rustup not found, install from "https://rustup.rs/")
-endif
-
-ifeq ($(shell which nasm),)
-$(error nasm not found, install from your package manager)
-endif
-
-CARGO_CONFIG_VERSION=0.1.1
-ifeq ($(shell cargo install --list | grep '^cargo-config v$(CARGO_CONFIG_VERSION):$$'),)
-$(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config")
-endif
-
-XARGO_VERSION=0.3.20
-ifeq ($(shell cargo install --list | grep '^xargo v$(XARGO_VERSION):$$'),)
-$(error xargo $(XARGO_VERSION) not found, run "cargo install --force --version $(XARGO_VERSION) xargo")
-endif

mk/prefix.mk

@@ -147,7 +147,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
 	cd "$<" && \
-	export PATH="$(PREFIX_BASE_PATH):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
+	export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
 	export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN xargo" && \
 	export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \
 	$(MAKE) -j `$(NPROC)` all && \

relibc

@@ -1 +1 @@
-Subproject commit d9bacaec0477ec494bf8937126aa5eb3e6cfabd0
+Subproject commit 5aa74fd2f3ba534da908ef83fccdd3fd41c6e493