Compare commits

...

5 Commits

Author SHA1 Message Date
Jeremy Soller
c7c2e89c3f
Require rustup and nasm 2020-06-06 21:35:35 -06:00
Jeremy Soller
f5e83779e0
Require cargo-config 2020-06-06 21:32:28 -06:00
Jeremy Soller
03e6618a10
Require xargo 0.3.20 2020-06-06 21:29:53 -06:00
Jeremy Soller
52982d83a4
Fix relibc-freestanding path 2020-06-06 21:12:15 -06:00
Jeremy Soller
088faded0b
Update relibc 2020-06-06 21:01:46 -06:00
4 changed files with 24 additions and 2 deletions

View File

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

19
mk/depends.mk Normal file
View File

@ -0,0 +1,19 @@
# 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

View File

@ -147,7 +147,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
rm -rf "$@.partial" "$@"
mkdir -p "$@.partial"
cd "$<" && \
export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export PATH="$(PREFIX_BASE_PATH):$(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 && \

2
relibc

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