haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1284-yesod-bin-ghc-8'

Browse Source
This commit is contained in:
Michael Snoyman 2016-10-07 17:03:15 +03:00
commit c86efd3294
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yesod-bin/GhcBuild.hs
View File

@ -100,7 +100,7 @@ getPackageArgs buildDir argv2 = do
hideAll | gopt DF.Opt_HideAllPackages dflags1 = [ "-hide-all-packages"] hideAll | gopt DF.Opt_HideAllPackages dflags1 = [ "-hide-all-packages"]
| otherwise = [] | otherwise = []
ownPkg = packageString (DF.thisPackage dflags1) ownPkg = packageString (DF.thisPackage dflags1)
return (reverse (extra dflags1) ++ hideAll ++ trustPkgFlags ++ ignorePkgFlags ++ pkgFlags ++ [ownPkg]) return (reverse (extra dflags1) ++ hideAll ++ trustPkgFlags ++ ignorePkgFlags ++ pkgFlags ++ ownPkg)
where where
#if __GLASGOW_HASKELL__ >= 800 #if __GLASGOW_HASKELL__ >= 800
convertIgnorePkgFlag (DF.IgnorePackage p) = "-ignore-package" ++ p convertIgnorePkgFlag (DF.IgnorePackage p) = "-ignore-package" ++ p
@ -124,11 +124,13 @@ getPackageArgs buildDir argv2 = do
#endif #endif
convertPkgFlag (DF.HidePackage p) = "-hide-package" ++ p convertPkgFlag (DF.HidePackage p) = "-hide-package" ++ p
#if __GLASGOW_HASKELL__ >= 800 #if __GLASGOW_HASKELL__ >= 800
packageString flags = "-package-id" ++ Module.unitIdString flags -- See: https://github.com/yesodweb/yesod/issues/1284
packageString _flags = []
--packageString flags = "-package-id" ++ Module.unitIdString flags
#elif __GLASGOW_HASKELL__ == 710 #elif __GLASGOW_HASKELL__ == 710
packageString flags = "-package-key" ++ Module.packageKeyString flags packageString flags = ["-package-key" ++ Module.packageKeyString flags]
#else #else
packageString flags = "-package-id" ++ Module.packageIdString flags ++ "-inplace" packageString flags = ["-package-id" ++ Module.packageIdString flags ++ "-inplace"]
#endif #endif
#if __GLASGOW_HASKELL__ >= 705 #if __GLASGOW_HASKELL__ >= 705
extra df = inplaceConf ++ extra' extra df = inplaceConf ++ extra'