Skip to content

Commit

Permalink
Fix 'make clean' (#719)
Browse files Browse the repository at this point in the history
  • Loading branch information
Akuli authored Feb 3, 2025
1 parent 057f1bf commit 1b5a38a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- run: sudo apt update
- run: sudo apt install -y llvm-{14,15,16}-dev clang-{14,15,16} make
- run: LLVM_CONFIG=llvm-config-14 ./doctest.sh
- run: make clean
- run: mv jou_bootstrap x; make clean; mv x jou_bootstrap
- run: LLVM_CONFIG=llvm-config-15 ./doctest.sh
- run: make clean
- run: mv jou_bootstrap x; make clean; mv x jou_bootstrap
- run: LLVM_CONFIG=llvm-config-16 ./doctest.sh
6 changes: 3 additions & 3 deletions Makefile.posix
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jou_bootstrap: bootstrap.sh
jou: jou_bootstrap config.jou $(wildcard compiler/*.jou compiler/*/*.jou)
rm -rf compiler/jou_compiled && ./jou_bootstrap -o jou --linker-flags "$(shell $(LLVM_CONFIG) --ldflags --libs)" compiler/main.jou

# Does not delete jou_bootstrap executable because bootstrapping is slow.
# Bootstrap folder is deleted without -v (verbose) because it contains many files.
# Does not delete tmp/bootstrap_cache because bootstrapping is slow.
.PHONY: clean
clean:
rm -rf tmp/bootstrap && rm -rvf jou jou.exe tmp config.jou
bash -O extglob -c "rm -rvf tmp/!(bootstrap_cache)"
rm -vf *.exe config.jou jou jou_bootstrap
find . -name jou_compiled -print -exec rm -rf '{}' +
8 changes: 4 additions & 4 deletions Makefile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jou_bootstrap.exe: bootstrap.sh
jou.exe: jou_bootstrap.exe config.jou $(wildcard compiler/*.jou compiler/*/*.jou)
rm -rf compiler/jou_compiled && ./jou_bootstrap.exe -o jou.exe --linker-flags "$(wildcard libs/lib*.a)" compiler/main.jou

# Does not delete jou_bootstrap executable because bootstrapping is slow.
# Bootstrap folder is deleted without -v (verbose) because it contains many files.
# Does not delete tmp/bootstrap_cache because bootstrapping is slow.
.PHONY: clean
clean:
rm -rf tmp/bootstrap && rm -rvf jou.exe tmp config.jou
find -name jou_compiled -print -exec rm -rf '{}' +
bash -O extglob -c "rm -rvf tmp/!(bootstrap_cache)"
rm -vf *.exe config.jou
find . -name jou_compiled -print -exec rm -rf '{}' +

0 comments on commit 1b5a38a

Please sign in to comment.