diff options
author | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:21:37 +0100 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:21:37 +0100 |
commit | 817e1d58628b9a40a13dddb8b9c28431b3d256cc (patch) | |
tree | d2f701613c9ba33c85c097f11f4c1422124b2124 /utils | |
parent | 3c45e5a0fc97a25c6743daeac9de1149322e9f9f (diff) | |
download | haskell-817e1d58628b9a40a13dddb8b9c28431b3d256cc.tar.gz |
Add TRANSITIVE_DEPS variables to package-data.mk files
Diffstat (limited to 'utils')
-rw-r--r-- | utils/ghc-cabal/Main.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 58ab921c45..001e47420f 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -369,6 +369,7 @@ generate config_args distdir directory dep_ids = map snd (externalPackageDeps lbi) let libraryDirs = forDeps Installed.libraryDirs + transitive_dep_ids = map Installed.sourcePackageId dep_pkgs wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs wrappedLibraryDirs <- wrap libraryDirs let depDynlibDirName d = display (Installed.sourcePackageId d) @@ -383,6 +384,8 @@ generate config_args distdir directory variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (hsSourceDirs bi), variablePrefix ++ "_DEPS = " ++ unwords (map display dep_ids), variablePrefix ++ "_DEP_NAMES = " ++ unwords (map (display . packageName) dep_ids), + variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords (map display transitive_dep_ids), + variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords (map (display . packageName) transitive_dep_ids), variablePrefix ++ "_RPATHS = " ++ unwords rpaths, variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi), variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi), |