[commit: ghc] master: Remove unused/redundant fields from ghc-cabal. (3b66960)

git at git.haskell.org git at git.haskell.org
Sun Dec 20 19:22:37 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3b669606914b2c712c4f0cb86de695cfbf2decfc/ghc

>---------------------------------------------------------------

commit 3b669606914b2c712c4f0cb86de695cfbf2decfc
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Dec 20 11:22:50 2015 -0800

    Remove unused/redundant fields from ghc-cabal.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1662


>---------------------------------------------------------------

3b669606914b2c712c4f0cb86de695cfbf2decfc
 utils/ghc-cabal/Main.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index ad18f2e..66ebd14 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -407,8 +407,6 @@ generate directory distdir dll0Modules config_args
       let xs = [variablePrefix ++ "_VERSION = " ++ display (pkgVersion (package pd)),
                 -- TODO: move inside withLibLBI
                 variablePrefix ++ "_COMPONENT_ID = " ++ display (localCompatPackageKey lbi),
-                -- copied from mkComponentsLocalBuildInfo
-                variablePrefix ++ "_COMPONENT_ID = " ++ display (localComponentId lbi),
                 variablePrefix ++ "_MODULES = " ++ unwords mods,
                 variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods,
                 variablePrefix ++ "_SYNOPSIS =" ++ synopsis pd,
@@ -417,9 +415,7 @@ generate directory distdir dll0Modules config_args
                 variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids,
                 variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames,
                 variablePrefix ++ "_DEP_COMPONENT_IDS = " ++ unwords depLibNames,
-                variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords transitiveDeps,
                 variablePrefix ++ "_TRANSITIVE_DEP_COMPONENT_IDS = " ++ unwords transitiveDepLibNames,
-                variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords transitiveDepNames,
                 variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi),
                 variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi),
                 variablePrefix ++ "_INSTALL_INCLUDES = " ++ unwords (installIncludes bi),



More information about the ghc-commits mailing list