[commit: ghc] master: Fix #10551 by using LIB_NAMES. (6c5a66a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6c5a66a225fcd65eb3abe32cc2128b0b90440451/ghc

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

commit 6c5a66a225fcd65eb3abe32cc2128b0b90440451
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sat Jun 20 16:15:41 2015 -0700

    Fix #10551 by using LIB_NAMES.
    
    Summary:
    (NB: this code is dead at the moment since Windows is not built
    dynamically.)
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: none
    
    Reviewers: austin
    
    Subscribers: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1001
    
    GHC Trac Issues: #10551


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

6c5a66a225fcd65eb3abe32cc2128b0b90440451
 rules/build-prog.mk     | 2 +-
 utils/ghc-cabal/Main.hs | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index f2f6ad2..eca3358 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -241,7 +241,7 @@ $1/$2/build/tmp/$$($1_$2_PROG)-wrapper.c: driver/utils/dynwrapper.c | $$$$(dir $
 	echo '#include <Windows.h>' >> $$@
 	echo '#include "Rts.h"' >> $$@
 	echo 'LPTSTR path_dirs[] = {' >> $$@
-	$$(foreach p,$$($1_$2_TRANSITIVE_DEP_KEYS),$$(call make-command,echo '    TEXT("/../lib/$$p")$$(comma)' >> $$@))
+	$$(foreach p,$$($1_$2_TRANSITIVE_DEP_LIB_NAMES),$$(call make-command,echo '    TEXT("/../lib/$$p")$$(comma)' >> $$@))
 	echo '    TEXT("/../lib/"),' >> $$@
 	echo '    NULL};' >> $$@
 	echo 'LPTSTR progDll = TEXT("../lib/$$($1_$2_PROG).dll");' >> $$@
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 6302349..77caf58 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -411,10 +411,6 @@ generate directory distdir dll0Modules config_args
 
           transitive_dep_ids = map Installed.sourcePackageId dep_pkgs
           transitiveDeps = map display transitive_dep_ids
-          transitiveDepKeys
-            | packageKeySupported comp
-                   = map (display . Installed.packageKey) dep_pkgs
-            | otherwise = transitiveDeps
           transitiveDepLibNames
             | packageKeySupported comp
                 = map (\p -> packageKeyLibraryName
@@ -451,7 +447,6 @@ generate directory distdir dll0Modules config_args
                 variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids,
                 variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames,
                 variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords transitiveDeps,
-                variablePrefix ++ "_TRANSITIVE_DEP_KEYS = " ++ unwords transitiveDepKeys,
                 variablePrefix ++ "_TRANSITIVE_DEP_LIB_NAMES = " ++ unwords transitiveDepLibNames,
                 variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords transitiveDepNames,
                 variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi),