on master help sign in
Merge pull request #3982 from melted/fix_cabal2_win

Fix build with Cabal 2.0.0.2 on Windows

commit7d0263a6174f42ce03098b9a8f8417a8af441717 authorNiklas Larsson <metaniklas@gmail.com> dateSun 6 Aug 2017, 02:09 (9 years ago) parente4fbe772584944
1 file changed+11−1
Setup.hs+11−1
Setup.hs+11−1
@@ -26,6 +26,11 @@ import System.Directory
2626import qualified System.FilePath.Posix as Px
2727import System.Process
2828
29+#if (MIN_VERSION_Cabal(2,0,0))
30+import Distribution.Types.UnqualComponentName
31+#endif
32+
33+
2934-- After Idris is built, we need to check and install the prelude and other libs
3035
3136-- -----------------------------------------------------------------------------
@@ -228,11 +233,16 @@ getVersion args flags = do
228233 let buildinfo = (emptyBuildInfo { cppOptions = ["-DVERSION="++hash] }) :: BuildInfo
229234 return (Just buildinfo, [])
230235
236+
237+#if !(MIN_VERSION_Cabal(2,0,0))
238+mkUnqualComponentName = id
239+#endif
240+
231241idrisPreBuild args flags = do
232242#ifdef mingw32_HOST_OS
233243 createDirectoryIfMissingVerbose verbosity True dir
234244 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"] })])
236246 where
237247 verbosity = S.fromFlag $ S.buildVerbosity flags
238248 dir = S.fromFlagOrDefault "dist" $ S.buildDistPref flags