diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-03-11 14:53:17 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-11 15:14:38 +0100 |
| commit | 838d8044896b6544d8c80c2ab5de63d97220f06c (patch) | |
| tree | 23d9d61ec314845305bbdbd69b6281836626ced5 /utils | |
| parent | 8cbd7f5d97cdc0f4cd6b8baaa999f990533dc801 (diff) | |
| download | haskell-838d8044896b6544d8c80c2ab5de63d97220f06c.tar.gz | |
Update Cabal submodule to latest 1.22 snapshot
This changes the library file name format
NOTE: This patch originally updated to Cabal HEAD, but was reduced to
update to Cabal 1.22 HEAD by hvr as this is needed in order to
update the filepath submodule to version 1.4.0, and subsequently
to be cherry-picked into the ghc-7.10 branch
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D707
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 6724f3ae52..47968a1b77 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -6,6 +6,7 @@ import Distribution.PackageDescription import Distribution.PackageDescription.Check hiding (doesFileExist) import Distribution.PackageDescription.Configuration import Distribution.PackageDescription.Parse +import Distribution.Package import Distribution.System import Distribution.Simple import Distribution.Simple.Configure @@ -438,6 +439,8 @@ generate directory distdir dll0Modules config_args allMods = mods ++ otherMods let xs = [variablePrefix ++ "_VERSION = " ++ display (pkgVersion (package pd)), variablePrefix ++ "_PACKAGE_KEY = " ++ display (pkgKey lbi), + -- copied from mkComponentsLocalBuildInfo + variablePrefix ++ "_LIB_NAME = " ++ packageKeyLibraryName (package pd) (pkgKey lbi), variablePrefix ++ "_MODULES = " ++ unwords mods, variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods, variablePrefix ++ "_SYNOPSIS =" ++ synopsis pd, |