summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 14:00:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 14:00:51 -0400
commit951992f3535a33eaa867410e5985835c59f6b22a (patch)
tree7492da46b5e999283180cc52132ec226ea900bb2 /Makefile
parentb74d1afc86eb5e2684ac1b41e5ff7dd3900e1ae4 (diff)
fast build mode no longer links exe with recent cabal
I tried removing the --no-link, but then the link fails. Which must be why cabal is using it.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 04ee69f22..c6eae8e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,8 @@ androidapp:
$(MAKE) -C standalone/android
# We bypass cabal, and only run the main ghc --make command for a
-# fast development built. Note: Does not rebuild C libraries.
+# fast development built. Note: Does not rebuild C libraries, or link
+# executable.
fast: dist/caballog
@$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0
@ln -sf dist/build/git-annex/git-annex git-annex