diff options
Diffstat (limited to 'hadrian/src/Hadrian/Haskell/Cabal/Parse.hs')
| -rw-r--r-- | hadrian/src/Hadrian/Haskell/Cabal/Parse.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs index f7bdf2cab9..2ab73b76c0 100644 --- a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs +++ b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs @@ -319,8 +319,11 @@ write_inplace_conf pkg_path res_path pd lbi = do pkg_name = C.display (C.pkgName (CP.sourcePackageId installedPkgInfo)) final_ipi = installedPkgInfo { Installed.includeDirs = concatMap fixupIncludeDir (Installed.includeDirs installedPkgInfo), - Installed.libraryDirs = [ build_dir ], - Installed.libraryDynDirs = [ build_dir ], + Installed.libraryDirs = build_dir: (concatMap fixupIncludeDir (Installed.libraryDirs installedPkgInfo)) , +#if MIN_VERSION_Cabal(3,8,0) + Installed.libraryDirsStatic = build_dir: (concatMap fixupIncludeDir (Installed.libraryDirsStatic installedPkgInfo)) , +#endif + Installed.libraryDynDirs = build_dir : (concatMap fixupIncludeDir (Installed.libraryDynDirs installedPkgInfo)) , Installed.dataDir = "${pkgroot}/../../../../" ++ pkg_path, Installed.haddockHTMLs = [build_dir ++ "/doc/html/" ++ C.display (CP.sourcePackageId installedPkgInfo)], Installed.haddockInterfaces = [build_dir ++ "/doc/html/" ++ pkg_name ++ "/" ++ pkg_name ++ ".haddock"], |