mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use same configure flags for both parts of android build

Browse source
This commit is contained in:
Joey Hess 2013-04-18 17:29:27 -04:00
parent 8de6a78e83
commit a28c9360c0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -158,11 +158,12 @@ osxapp: Build/Standalone Build/OSXMkLibs
rm -f tmp/git-annex.dmg.bz2 rm -f tmp/git-annex.dmg.bz2
bzip2 --fast tmp/git-annex.dmg bzip2 --fast tmp/git-annex.dmg
ANDROID_FLAGS='Assistant -Pairing -XMPP'
# Cross compile for Android. # Cross compile for Android.
# Uses https://github.com/neurocyte/ghc-android # Uses https://github.com/neurocyte/ghc-android
android: Build/EvilSplicer android: Build/EvilSplicer
echo "Running native build, to get TH splices.." 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 mkdir -p tmp
if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi 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.." echo "Setting up Android build tree.."
@ -182,7 +183,7 @@ android: Build/EvilSplicer
if [ ! -e tmp/androidtree/dist/setup/setup ]; then \ if [ ! -e tmp/androidtree/dist/setup/setup ]; then \
cd tmp/androidtree; \ cd tmp/androidtree; \
cabal configure; \ 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 fi
$(MAKE) -C tmp/androidtree git-annex $(MAKE) -C tmp/androidtree git-annex