diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-18 17:29:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-18 17:29:27 -0400 |
| commit | f6aee8128bb52ec5af866a81b6bf94a2885c22de (patch) | |
| tree | 4d88bf87e29664c5c16579b3365e7a237955fb5e | |
| parent | b5ad4977e613cd226d98dc8a69fd2c558f374fda (diff) | |
use same configure flags for both parts of android build
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -158,11 +158,12 @@ osxapp: Build/Standalone Build/OSXMkLibs rm -f tmp/git-annex.dmg.bz2 bzip2 --fast tmp/git-annex.dmg +ANDROID_FLAGS='Assistant -Pairing -XMPP' # Cross compile for Android. # 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; fi + if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f"-Production $(ANDROID_FLAGS)" -O0; 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.." @@ -182,7 +183,7 @@ android: Build/EvilSplicer if [ ! -e tmp/androidtree/dist/setup/setup ]; then \ cd tmp/androidtree; \ cabal configure; \ - $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing'; \ + $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f"Android $(ANDROID_FLAGS)"; \ fi $(MAKE) -C tmp/androidtree git-annex |