diff options
| -rw-r--r-- | rules/build-prog.mk | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index f2f6ad2551..eca3358e25 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 6302349a2a..77caf5819e 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), |