Fix #10551 by using LIB_NAMES.
authorEdward Z. Yang <ezyang@cs.stanford.edu>
Sat, 20 Jun 2015 23:15:41 +0000 (16:15 -0700)
committerEdward Z. Yang <ezyang@cs.stanford.edu>
Mon, 22 Jun 2015 17:32:27 +0000 (10:32 -0700)
Summary:
(NB: this code is dead at the moment since Windows is not built
dynamically.)

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: none

Reviewers: austin

Subscribers: thomie, bgamari

Differential Revision: https://phabricator.haskell.org/D1001

GHC Trac Issues: #10551

rules/build-prog.mk
utils/ghc-cabal/Main.hs

index f2f6ad2..eca3358 100644 (file)
@@ -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");' >> $$@
index 6302349..77caf58 100644 (file)
@@ -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),