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 | |
| 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.
| -rw-r--r-- | Build/Configure.hs | 9 | ||||
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index ec3f4ccc4..616dcc57d 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -5,7 +5,6 @@ module Build.Configure where import Control.Applicative -import System.Environment (getArgs) import Control.Monad.IfElse import Control.Monad @@ -133,12 +132,12 @@ cleanup = removeDirectoryRecursive tmpDir run :: [TestCase] -> IO () run ts = do - args <- getArgs setup config <- runTests ts - if args == ["Android"] - then writeSysConfig $ androidConfig config - else writeSysConfig config + v <- getEnv "CROSS_COMPILE" + case v of + Just "Android" -> writeSysConfig $ androidConfig config + _ -> writeSysConfig config cleanup whenM isReleaseBuild $ cabalSetup "git-annex.cabal" @@ -5,6 +5,7 @@ git-annex (6.20160809) UNRELEASED; urgency=medium Thanks, Jim Paris. * examimekey: Allow being run in a git repo that is not initialized by git-annex yet. + * Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384. -- Joey Hess <id@joeyh.name> Mon, 05 Sep 2016 11:51:49 -0400 @@ -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 |