2584944 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Fix build with Cabal 2.0.0.2 on Windows

2584944Niklas Larsson9 years ago

Setup.hs+11−1

@@ -26,6 +26,11 @@ import System.Directory

26import qualified System.FilePath.Posix as Px

27import System.Process

29+#if (MIN_VERSION_Cabal(2,0,0))

30+import Distribution.Types.UnqualComponentName

31+#endif

32+

33+

29-- After Idris is built, we need to check and install the prelude and other libs

34-- After Idris is built, we need to check and install the prelude and other libs

31-- -----------------------------------------------------------------------------

36-- -----------------------------------------------------------------------------

@@ -228,11 +233,16 @@ getVersion args flags = do

228 let buildinfo = (emptyBuildInfo { cppOptions = ["-DVERSION="++hash] }) :: BuildInfo

233 let buildinfo = (emptyBuildInfo { cppOptions = ["-DVERSION="++hash] }) :: BuildInfo

229 return (Just buildinfo, [])

234 return (Just buildinfo, [])

230

235

236+

237+#if !(MIN_VERSION_Cabal(2,0,0))

238+mkUnqualComponentName = id

239+#endif

240+

231idrisPreBuild args flags = do

241idrisPreBuild args flags = do

232#ifdef mingw32_HOST_OS

242#ifdef mingw32_HOST_OS

233 createDirectoryIfMissingVerbose verbosity True dir

243 createDirectoryIfMissingVerbose verbosity True dir

234 windres verbosity ["icons/idris_icon.rc","-o", dir++"/idris_icon.o"]

244 windres verbosity ["icons/idris_icon.rc","-o", dir++"/idris_icon.o"]

235− return (Nothing, [("idris", emptyBuildInfo { ldOptions = [dir ++ "/idris_icon.o"] })])

245+ return (Nothing, [(mkUnqualComponentName "idris", emptyBuildInfo { ldOptions = [dir ++ "/idris_icon.o"] })])

236 where

246 where

237 verbosity = S.fromFlag $ S.buildVerbosity flags

247 verbosity = S.fromFlag $ S.buildVerbosity flags

238 dir = S.fromFlagOrDefault "dist" $ S.buildDistPref flags

248 dir = S.fromFlagOrDefault "dist" $ S.buildDistPref flags