diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-12 11:53:57 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-25 22:52:26 -0400 |
| commit | 4c2127c4837d7e2588399c06b56b45b2d4c2f9b0 (patch) | |
| tree | 8275789c49d6bdaae996fa25d25efc088dce529d /utils/ghc-cabal | |
| parent | ff2b99e19fc4245c171edd399f0e18301e0ba535 (diff) | |
| download | haskell-4c2127c4837d7e2588399c06b56b45b2d4c2f9b0.tar.gz | |
Bump containers submodule to v0.6.2.1
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 0782ead535..7f2cf91bb8 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -388,10 +388,11 @@ generate directory distdir config_args libraryDirs = forDeps Installed.libraryDirs -- The mkLibraryRelDir function is a bit of a hack. -- Ideally it should be handled in the makefiles instead. - mkLibraryRelDir "rts" = "rts/dist/build" - mkLibraryRelDir "ghc" = "compiler/stage2/build" - mkLibraryRelDir "Cabal" = "libraries/Cabal/Cabal/dist-install/build" - mkLibraryRelDir l = "libraries/" ++ l ++ "/dist-install/build" + mkLibraryRelDir "rts" = "rts/dist/build" + mkLibraryRelDir "ghc" = "compiler/stage2/build" + mkLibraryRelDir "Cabal" = "libraries/Cabal/Cabal/dist-install/build" + mkLibraryRelDir "containers" = "libraries/containers/containers/dist-install/build" + mkLibraryRelDir l = "libraries/" ++ l ++ "/dist-install/build" libraryRelDirs = map mkLibraryRelDir transitiveDepNames -- this is a hack to accommodate Cabal 2.2+ more hygenic |