diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-11-09 23:13:39 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-11-10 12:57:08 +0100 |
| commit | 335251a2a623e879beba71971bc5e180bebbb778 (patch) | |
| tree | afe40863dc64207a4fe6486da11ebd8c9c75e975 /utils | |
| parent | ce50db6dd46e84f70cd31df360d28be783b7ec81 (diff) | |
| download | haskell-wip/T9281.tar.gz | |
Rename integer-gmp2's package name to `integer-gmp`wip/T9281
While the folder-name stays the same. This also bumps the version number
to 1.0.0.0 (old integer-gmp is at 0.5.1.x)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 1847aafce5..21acd14478 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -418,11 +418,14 @@ generate directory distdir dll0Modules config_args transitiveDepNames = map (display . packageName) transitive_dep_ids libraryDirs = forDeps Installed.libraryDirs + -- temporary hack to support two in-tree versions of `integer-gmp` + isIntegerGmp2 = any ("integer-gmp2" `isInfixOf`) 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 "integer-gmp" | isIntegerGmp2 = mkLibraryRelDir "integer-gmp2" mkLibraryRelDir l = "libraries/" ++ l ++ "/dist-install/build" libraryRelDirs = map mkLibraryRelDir transitiveDepNames wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs |