summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-05 13:56:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-05 13:56:27 -0400
commit69543795d6093472d171b1c04bcf92464aa60beb (patch)
tree7805ad21fb3703aaa804b28ec04963e2f0cde71d /Makefile
parent99f29fecc64a7dde5a0eb644efe3ebfc6e1b3c36 (diff)
move -j1 setting to BUILDEROPTIONS, set in debian/rules file
I needed BUILDEROPTIONS to allow passing flags to stack build, but it also lets me move the -j1 out of the normal build path, and to debian/rules which has the goal of having a reproducible build
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6d8dca599..e2eb88214 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,13 @@ build: $(all)
Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi
if [ "$(BUILDER)" = stack ]; then \
- $(BUILDER) build -j1; \
+ $(BUILDER) build $(BUILDEROPTIONS); \
else \
$(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
fi
-# -j1 is used for reproducible build
git-annex: Build/SysConfig.hs
- $(BUILDER) build -j1
+ $(BUILDER) build $(BUILDEROPTIONS)
if [ "$(BUILDER)" = stack ]; then \
ln -sf $$(find .stack-work/ -name git-annex -type f | grep build/git-annex/git-annex | tail -n 1) git-annex; \
else \