From 43d88b16fbe7a8141570cc23c99dfe224e997ba3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Sep 2016 14:11:35 -0400 Subject: 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. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 46fc66a0a..92c2989b9 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3