Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/817e1d58628b9a40a13dddb8b9c28431b3d256cc >--------------------------------------------------------------- commit 817e1d58628b9a40a13dddb8b9c28431b3d256cc Author: Ian Lynagh <[email protected]> Date: Sun Oct 14 01:21:37 2012 +0100 Add TRANSITIVE_DEPS variables to package-data.mk files >--------------------------------------------------------------- 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 58ab921..001e474 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), _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
