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. --- Build/Configure.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Build') 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" -- cgit v1.2.3