From fe18594c50ef9ae7a8288cbe71f6beee1b38ef1f Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 7 Jan 2020 18:19:18 +1000 Subject: [PATCH] more makefile fixes can't rely on SHELLFLAGS on macOS --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 57cd27c98..ac6365801 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,8 @@ buildhash: .PHONY: run run: pyenv buildhash - @. pyenv/bin/activate && \ + @set -e && \ + . pyenv/bin/activate && \ for dir in $(DEVEL); do \ $(SUBMAKE) -C $$dir develop BUILDFLAGS="$(BUILDFLAGS)"; \ done; \ @@ -59,7 +60,8 @@ build-qt: .PHONY: clean clean: clean-dist - @for dir in $(DEVEL); do \ + @set -e && \ + for dir in $(DEVEL); do \ $(SUBMAKE) -C $$dir clean; \ done @@ -81,6 +83,7 @@ check: pyenv buildhash .PHONY: fix fix: + @set -e && \ for dir in $(CHECKABLE); do \ $(SUBMAKE) -C $$dir fix; \ done; \