fold Build/SysConfig.hs into BuildInfo via include

This avoids warnings from stack about the module not being listed in the
cabal file. So, the generated file is also renamed to Build/SysConfig.

Note that the setup program seems to be cached despite these changes; I
had to cabal clean to get cabal to update it so that Build/SysConfig was
written.

This commit was sponsored by Jochen Bartl on Patreon.
This commit is contained in:
Joey Hess 2017-12-14 12:46:57 -04:00
parent ad6683e722
commit 308cd1383c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
24 changed files with 64 additions and 63 deletions

View file

@ -33,7 +33,7 @@ module Utility.Url (
import Common
import Utility.Tmp
import qualified Build.SysConfig
import qualified BuildInfo
import Network.URI
import Network.HTTP.Types
@ -163,7 +163,7 @@ getUrlInfo url uo = case parseURIRelaxed url of
sz <- getFileSize' f stat
found (Just sz) Nothing
Nothing -> dne
| Build.SysConfig.curl -> existscurl u
| BuildInfo.curl -> existscurl u
| otherwise -> dne
Nothing -> dne
where
@ -281,7 +281,7 @@ download' quiet url file uo = do
-}
#ifndef __ANDROID__
wgetparams = concat
[ if Build.SysConfig.wgetunclutter && not quiet
[ if BuildInfo.wgetunclutter && not quiet
then [Param "-nv", Param "--show-progress"]
else []
, [ Param "--clobber", Param "-c", Param "-O"]