summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-09-30 19:48:52 +0200
committermetamuffin <metamuffin@disroot.org>2024-09-30 19:48:52 +0200
commit7f0a32fdd8c614194b08df2a6ec579d743cc7cda (patch)
treeb6981887a3a945c4fd29ccf1241065845a7c7a67
parentf234ce8bb28e1528783d662243aa07ad23df5ed9 (diff)
downloadhurrycurry-7f0a32fdd8c614194b08df2a6ec579d743cc7cda.tar
hurrycurry-7f0a32fdd8c614194b08df2a6ec579d743cc7cda.tar.bz2
hurrycurry-7f0a32fdd8c614194b08df2a6ec579d743cc7cda.tar.zst
add CARGOFLAGS everywhere
-rw-r--r--client/makefile2
-rw-r--r--data/makefile2
-rw-r--r--makefile2
-rw-r--r--pixel-client/makefile4
-rw-r--r--server/makefile4
-rw-r--r--test-client/makefile2
6 files changed, 8 insertions, 8 deletions
diff --git a/client/makefile b/client/makefile
index c9a58f04..c992372d 100644
--- a/client/makefile
+++ b/client/makefile
@@ -29,7 +29,7 @@ menu/book/book_01.webp:
@curl -L https://s.metamuffin.org/static/hurrycurry/book.webp.tar.zst | tar -xC menu/book
$(LT): $(shell find ../locale/tools -type f)
- { cd ..; cargo build --release --bin localetool; }
+ { cd ..; cargo $(CARGOFLAGS) build --release --bin localetool; }
po/locales.csv: $(LT)
@mkdir -p po
diff --git a/data/makefile b/data/makefile
index 7b954476..4c948a81 100644
--- a/data/makefile
+++ b/data/makefile
@@ -27,7 +27,7 @@ recipes/default.yaml: recipes/default.js
DENO_NO_UPDATE_CHECK=1 $(JSR) $< > $@
recipes/%.gv.txt: recipes/%.yaml
- { cd .. && cargo run --release --bin graph $(patsubst recipes/%.yaml,%,$<); } > $@
+ { cd .. && cargo $(CARGOFLAGS) run --release --bin graph $(patsubst recipes/%.yaml,%,$<); } > $@
recipes/%.svg: recipes/%.gv.txt
dot -Tsvg -Kdot >$@<$<
diff --git a/makefile b/makefile
index 5bacd060..4c70a3b2 100644
--- a/makefile
+++ b/makefile
@@ -33,4 +33,4 @@ clean:
make -C client clean
make -C pixel-client clean
make -C test-client clean
- cargo clean
+ cargo $(CARGOFLAGS) clean
diff --git a/pixel-client/makefile b/pixel-client/makefile
index 80ab64bc..339defcf 100644
--- a/pixel-client/makefile
+++ b/pixel-client/makefile
@@ -41,9 +41,9 @@ clean:
$(RM) assets/atlas.ta assets/atlas.meta.csv
$(CLIENT): $(shell find src -type f) $(CLIENT_DEPS)
- cargo build --release --bin pixelcurry
+ cargo $(CARGOFLAGS) build --release --bin pixelcurry
$(IMPORT) $(EXPORT) $(PACK) $(COMPOSE): $(shell find tools/src -type f)
- { cd tools; cargo build --release; }
+ { cd tools; cargo $(CARGOFLAGS) build --release; }
%.ta: %.import.png $(IMPORT)
$(IMPORT) $< $@
diff --git a/server/makefile b/server/makefile
index b80ff3b8..c959b948 100644
--- a/server/makefile
+++ b/server/makefile
@@ -22,7 +22,7 @@ all: $(SERVER) $(REPLAYTOOL)
clean:
$(SERVER): $(shell find protocol src -type f)
- cargo build --release
+ cargo $(CARGOFLAGS) build --release
$(REPLAYTOOL): $(shell find protocol replaytool -type f)
- { cd replaytool; cargo build --release; }
+ { cd replaytool; cargo $(CARGOFLAGS) build --release; }
diff --git a/test-client/makefile b/test-client/makefile
index b6c0438d..d7bbb51a 100644
--- a/test-client/makefile
+++ b/test-client/makefile
@@ -26,7 +26,7 @@ main.js: main.ts $(wildcard *.ts)
LT = ../target/release/localetool
$(LT): $(shell find ../locale/tools -type f)
- { cd ..; cargo build --release --bin localetool; }
+ { cd ..; cargo $(CARGOFLAGS) build --release --bin localetool; }
locale/%.json: ../locale/%.ini $(LT) ../locale/en.ini
@mkdir -p locale