Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.
This was originally done in a7ef05a9
, 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.
This commit is contained in:
parent
40c0a91641
commit
49b3ef88f7
3 changed files with 6 additions and 6 deletions
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue