diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-27 09:31:41 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-27 09:31:41 -0700 |
| commit | e9e44599e5c663bbb3eb4c87509a539a737aa2b7 (patch) | |
| tree | e9fbf5b5784248e45d0b1b56006b7750fa6db773 | |
| parent | 8503220e6a1303a05a71e8a109d69c6aa89a0b5f (diff) | |
speed up fast builds
Enabling -dynamic avoids writing out many mb of static libs.
-j parallelizes
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -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 & diff --git a/git-annex.cabal b/git-annex.cabal index df5198627..306e9bc6b 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -153,8 +153,6 @@ Executable git-annex Build-Depends: cryptohash (>= 0.11.0) -- Fully optimize for production. - -- Parallel builds only when not building for production, - -- because ghc is known to not yield reproducible builds this way. if flag(Production) GHC-Options: -O2 |