From a6f17a7044cdc4cb16e9e386d86824b2c7c8a11c Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sat, 10 Apr 2021 18:58:37 +0100 Subject: [PATCH] modify makefile to no longer build crt0.s --- Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 1880d4cd..8ecb60d8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -BINUTILS_PREFIX=arm-none-eabi- -CC=$(BINUTILS_PREFIX)as -ARCH = -mthumb-interwork -mthumb - RUSTFILES=$(shell find . -name '*.rs') .ONESHELL: @@ -28,20 +24,13 @@ r-%: out/release/%.gba @mgba-qt -l 31 -d -C logToStdout=1 $< @rm -f out/release/$${OUTNAME}.sav -cargo-release-%: $(RUSTFILES) out/crt0.o +cargo-release-%: $(RUSTFILES) @OUTNAME=$(patsubst cargo-release-%,%, $@) @rustup run nightly cargo build --release --example=$${OUTNAME} -cargo-debug-%: $(RUSTFILES) out/crt0.o +cargo-debug-%: $(RUSTFILES) @OUTNAME=$(patsubst cargo-debug-%,%, $@) @rustup run nightly cargo build --example=$${OUTNAME} -out/crt0.o: crt0.s interrupt_simple.s - @mkdir -p $(dir $@) - @$(CC) $(ARCH) -o out/crt0.o crt0.s - -clippy: - rustup run nightly cargo clippy - doc: rustup run nightly cargo doc \ No newline at end of file