diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 13:41:20 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-14 21:40:58 -0700 |
| commit | 6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c (patch) | |
| tree | c2a14d6f908cf76e4d3b71342dc36d781bc2e40d /utils/ghc-cabal | |
| parent | b92a51f5e235fc22a9ae0d76735b50f095665fb7 (diff) | |
| download | haskell-6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c.tar.gz | |
Rename PACKAGE_KEY and LIB_NAME in build system.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 71ba847c48..6e3e10cee7 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -406,9 +406,9 @@ generate directory distdir dll0Modules config_args allMods = mods ++ otherMods let xs = [variablePrefix ++ "_VERSION = " ++ display (pkgVersion (package pd)), -- TODO: move inside withLibLBI - variablePrefix ++ "_PACKAGE_KEY = " ++ display (localCompatPackageKey lbi), + variablePrefix ++ "_COMPONENT_ID = " ++ display (localCompatPackageKey lbi), -- copied from mkComponentsLocalBuildInfo - variablePrefix ++ "_LIB_NAME = " ++ display (localComponentId lbi), + variablePrefix ++ "_COMPONENT_ID = " ++ display (localComponentId lbi), variablePrefix ++ "_MODULES = " ++ unwords mods, variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods, variablePrefix ++ "_SYNOPSIS =" ++ synopsis pd, @@ -416,9 +416,9 @@ generate directory distdir dll0Modules config_args variablePrefix ++ "_DEPS = " ++ unwords deps, variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids, variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames, - variablePrefix ++ "_DEP_LIB_NAMES = " ++ unwords depLibNames, + variablePrefix ++ "_DEP_COMPONENT_IDS = " ++ unwords depLibNames, variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords transitiveDeps, - variablePrefix ++ "_TRANSITIVE_DEP_LIB_NAMES = " ++ unwords transitiveDepLibNames, + variablePrefix ++ "_TRANSITIVE_DEP_COMPONENT_IDS = " ++ unwords transitiveDepLibNames, variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords transitiveDepNames, variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi), variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi), |