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

fix make fast to link executable again

Browse source 
Use second ghc pass, not first.
This commit is contained in:
Joey Hess 2016-02-15 00:57:55 -04:00
parent 4ee302d1b0
commit 7aab9a0b23
Failed to extract signature
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -251,16 +251,17 @@ androidapp:
$(MAKE) android $(MAKE) android
$(MAKE) -C standalone/android $(MAKE) -C standalone/android
# We bypass cabal, and only run the main ghc --make command for a # Bypass cabal, and only run the main ghc --make command for a
# fast development built. # faster development build.
fast: dist/caballog fast: dist/cabalbuild
@$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0 -j -dynamic @sh dist/cabalbuild
@ln -sf dist/build/git-annex/git-annex git-annex @ln -sf dist/build/git-annex/git-annex git-annex
@$(MAKE) tags >/dev/null 2>&1 & @$(MAKE) tags >/dev/null 2>&1 &
dist/caballog: git-annex.cabal dist/cabalbuild: git-annex.cabal
$(BUILDER) configure -f"-Production" -O0 --enable-executable-dynamic $(BUILDER) configure -f"-Production" -O0 --enable-executable-dynamic
$(BUILDER) build -v2 | tee $@ $(BUILDER) build -v2 --ghc-options="-O0 -j" | tee dist/caballog
grep 'ghc --make' dist/caballog | tail -n 1 > dist/cabalbuild
# Hardcoded command line to make hdevtools start up and work. # Hardcoded command line to make hdevtools start up and work.
# You will need some memory. It's worth it. # You will need some memory. It's worth it.