commit fed5bc4e066a9aa2304b854d8fd7fe3c34f71e3b
parent f85018e2dfbaedd5364813c667b16fa4b509ccaf
Author: Drew DeVault <sir@cmpwn.com>
Date: Sat, 13 Mar 2021 18:21:23 -0500
Move binaries into .bin
This will be helpful when we write the two-stage bootstrap stuff
Diffstat:
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
cache
config.mk
-cmd/hare/hare
-cmd/hare/hare-tests
+.bin
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ TESTCACHE=$(HARECACHE)/+test
TESTHAREFLAGS=$(HAREFLAGS) -T +test
STDLIB=./
-cmd/hare/hare:
+.bin/hare:
.SUFFIXES: .ha .ssa .s .o
.ssa.s:
@@ -32,23 +32,24 @@ $(TESTCACHE)/hare.ssa: $(hare_srcs) $(hare_testlib_deps)
@printf 'HAREC\t$@\n'
@HARECACHE=$(TESTCACHE) $(HAREC) $(TESTHAREFLAGS) -o $@ $(hare_srcs)
-cmd/hare/hare: $(HARECACHE)/hare.o
+.bin/hare: $(HARECACHE)/hare.o
+ @mkdir -p .bin
@printf 'LD\t$@\n'
@$(LD) -T $(rtscript) --gc-sections -o $@ \
$(HARECACHE)/hare.o $(hare_stdlib_deps)
-cmd/hare/hare-tests: $(TESTCACHE)/hare.o
+.bin/hare-tests: $(TESTCACHE)/hare.o
+ @mkdir -p .bin
@printf 'LD\t$@\n'
@$(LD) -T $(rtscript) -o $@ \
$(TESTCACHE)/hare.o $(hare_testlib_deps)
clean:
- @rm -rf cache
- @rm -f hare hare-tests
+ @rm -rf cache .bin
-check: cmd/hare/hare-tests
- @./cmd/hare/hare-tests
+check: .bin/hare-tests
+ @./.bin/hare-tests
-all: cmd/hare/hare
+all: .bin/hare
.PHONY: all clean check
diff --git a/hare.sh b/hare.sh
@@ -1,2 +1,2 @@
-export PATH=$PATH:$(pwd)/cmd/hare
+export PATH=$PATH:$(pwd)/.bin
export HAREPATH=$(pwd)