summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-08-27 09:31:41 -0700
committerGravatar Joey Hess <joeyh@joeyh.name>2015-08-27 09:31:41 -0700
commite9e44599e5c663bbb3eb4c87509a539a737aa2b7 (patch)
treee9fbf5b5784248e45d0b1b56006b7750fa6db773 /Makefile
parent8503220e6a1303a05a71e8a109d69c6aa89a0b5f (diff)
speed up fast builds
Enabling -dynamic avoids writing out many mb of static libs. -j parallelizes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f468e1b0b..6f0caf753 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ ANDROID_FLAGS?=
# Uses https://github.com/neurocyte/ghc-android
android: Build/EvilSplicer
echo "Running native build, to get TH splices.."
- if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f-Production -O0 $(ANDROID_FLAGS) -fAndroidSplice; fi
+ if [ ! -e dist/setup/setup ]; then $(CABAL) configure -O0 $(ANDROID_FLAGS) -fAndroidSplice; fi
mkdir -p tmp
if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi
echo "Setting up Android build tree.."
@@ -240,7 +240,7 @@ androidapp:
# 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
+ @$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0 -j -dynamic
@ln -sf dist/build/git-annex/git-annex git-annex
@$(MAKE) tags >/dev/null 2>&1 &