diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-16 16:51:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-16 16:51:24 -0400 |
| commit | 285ee7cba10b30b3cab4eaba172f2820f1b3c179 (patch) | |
| tree | 7a056dab709211c864c95d9c8e7624eccae97249 /Makefile | |
| parent | 1ed09c93a536a2e47ec9a24ad289144069b9dc96 (diff) | |
Build with -j1 again to get reproducible build.
This was in the cabal file earlier, and was removed because it broke the
android cross build. Moving to the git-annex target of the Makefile
will make it be used for Debian packages etc but not android cross builds
or make fast or when users build with cabal.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -18,8 +18,9 @@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi $(CABAL) configure --ghc-options="$(shell Build/collect-ghc-options.sh)" +# -j1 is used for reproducible build git-annex: Build/SysConfig.hs - $(CABAL) build + $(CABAL) build -j1 ln -sf dist/build/git-annex/git-annex git-annex man/%.1: doc/%.mdwn @@ -242,8 +243,7 @@ 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, or link -# executable. +# fast development built. fast: dist/caballog @$$(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 |