fix for Cabal library older than 1.16
This commit is contained in:
parent
2c8be21b05
commit
a4ae1803f7
@ -220,7 +220,6 @@ runBuildHook Nothing = return ()
|
|||||||
-}
|
-}
|
||||||
configure :: FilePath -> String -> D.GenericPackageDescription -> DevelOpts -> IO ()
|
configure :: FilePath -> String -> D.GenericPackageDescription -> DevelOpts -> IO ()
|
||||||
configure _cabalFile ghcVer gpd opts = do
|
configure _cabalFile ghcVer gpd opts = do
|
||||||
print (DSS.configPackageDBs configFlags)
|
|
||||||
lbi <- D.configure (gpd, hookedBuildInfo) configFlags
|
lbi <- D.configure (gpd, hookedBuildInfo) configFlags
|
||||||
D.writePersistBuildConfig (getBuildDir opts) lbi -- fixme we could keep this in memory instead of file
|
D.writePersistBuildConfig (getBuildDir opts) lbi -- fixme we could keep this in memory instead of file
|
||||||
where
|
where
|
||||||
@ -234,17 +233,24 @@ configure _cabalFile ghcVer gpd opts = do
|
|||||||
]
|
]
|
||||||
, DSS.configHcPkg = DSS.Flag "ghc-pkg"
|
, DSS.configHcPkg = DSS.Flag "ghc-pkg"
|
||||||
}
|
}
|
||||||
|
#if MIN_VERSION_Cabal(1,16,0)
|
||||||
configFlags | isCabalDev opts = configFlags0
|
configFlags | isCabalDev opts = configFlags0
|
||||||
{ DSS.configPackageDBs =
|
{ DSS.configPackageDBs =
|
||||||
|
|
||||||
[ Nothing
|
[ Nothing
|
||||||
, Just D.GlobalPackageDB
|
, Just D.GlobalPackageDB
|
||||||
, Just $ D.SpecificPackageDB ("cabal-dev/packages-" ++ ghcVer ++ ".conf")
|
, Just cabalDevPackageDb
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
configFlags | isCabalDev opts = configFlags0
|
||||||
|
{ DSS.configPackageDB = DSS.Flag cabalDevPackageDb
|
||||||
|
}
|
||||||
|
#endif
|
||||||
| otherwise = configFlags0
|
| otherwise = configFlags0
|
||||||
|
|
||||||
|
cabalDevPackageDb = D.SpecificPackageDB ("cabal-dev/packages-" ++ ghcVer ++ ".conf")
|
||||||
|
|
||||||
|
|
||||||
config = (DSS.defaultConfigFlags D.defaultProgramConfiguration)
|
config = (DSS.defaultConfigFlags D.defaultProgramConfiguration)
|
||||||
{ DSS.configConfigurationsFlags =
|
{ DSS.configConfigurationsFlags =
|
||||||
[ (D.FlagName "devel", True) -- legacy
|
[ (D.FlagName "devel", True) -- legacy
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user