From 86e5600952d1249b3a8d61912d1a3d8735892bd5 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Wed, 27 Sep 2023 19:22:08 -0700 Subject: [PATCH] ensure default is run before any toolchain commands in dist, to allow user to optionally restore toolchain.tgz cache --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 663ce7c..6c52807 100644 --- a/Makefile +++ b/Makefile @@ -157,12 +157,12 @@ toolchain-reproduce: toolchain-clean && echo "Success: $(OUT_DIR) and $(DIST_DIR) are identical" .PHONY: toolchain-dist -toolchain-dist: toolchain-clean toolchain-restore-mtime toolchain-dist-cache +toolchain-dist: git ls-files -o --exclude-standard | grep . \ && { echo "Error: Git has untracked files present"; exit 1; } || : git diff --name-only | grep . \ && { echo "Error: Git has unstaged changes present"; exit 1; } || : - $(MAKE) default + $(MAKE) toolchain-clean default toolchain-restore-mtime toolchain-dist-cache cp -Rp $(OUT_DIR)/* $(DIST_DIR)/ $(BIN_DIR):