diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-05 14:11:35 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-05 14:11:35 -0400 |
| commit | 43d88b16fbe7a8141570cc23c99dfe224e997ba3 (patch) | |
| tree | 4e4f02e53d0a915cd25529ffa4aa056218f32b49 /Makefile | |
| parent | 3bcc0efea0cfa00ec4bca033a61678a74f936332 (diff) | |
Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.
This was originally done in c4e7c6af, but got lost in some change to the
Makefile. Use CROSS_COMPILE=Android to tell configure that it's configuring
for android instead of passing it a parameter.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -238,7 +238,7 @@ android: Build/EvilSplicer # Build just once, but link repeatedly, for different versions of Android. mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 tmp/androidtree/dist/build/git-annex/5.0 if [ ! -e tmp/androidtree/dist/setup-config ]; then \ - cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \ + cd tmp/androidtree && CROSS_COMPILE=Android $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \ fi cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \ && mv dist/build/git-annex/git-annex dist/build/git-annex/4.0/git-annex |