mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add BUILDERCOMMONOPTIONS

Browse source 
Needed because stack path needs to be passed the modified stack.yaml to
use as well.
This commit is contained in:
Joey Hess 2018-11-21 11:36:38 -04:00
parent 654981f3f0
commit 6ba6c6b539
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -21,15 +21,17 @@ build: $(all)
tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs
if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi
if [ "$(BUILDER)" != stack ]; then \ if [ "$(BUILDER)" != stack ]; then \
$(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \ $(BUILDER) configure $(BUILDERCOMMONOPTIONS) --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
else \
$(BUILDER) setup $(BUILDERCOMMONOPTIONS); \
fi fi
mkdir -p tmp mkdir -p tmp
touch tmp/configure-stamp touch tmp/configure-stamp
git-annex: tmp/configure-stamp git-annex: tmp/configure-stamp
$(BUILDER) build $(BUILDEROPTIONS) $(BUILDER) build $(BUILDERCOMMONOPTIONS) $(BUILDEROPTIONS)
if [ "$(BUILDER)" = stack ]; then \ if [ "$(BUILDER)" = stack ]; then \
ln -sf $$(stack path --dist-dir)/build/git-annex/git-annex git-annex; \ ln -sf $$(stack path $(BUILDERCOMMONOPTIONS) --dist-dir)/build/git-annex/git-annex git-annex; \
else \ else \
ln -sf dist/build/git-annex/git-annex git-annex; \ ln -sf dist/build/git-annex/git-annex git-annex; \
fi fi