diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-20 15:35:28 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-22 10:32:27 -0700 |
| commit | f70fb6892f5fd32e6161e951aa3e804148afd2fe (patch) | |
| tree | 3a7e377e1a1d7c71d31b1022f5e2da5961a1cc12 | |
| parent | e60dbf30adfcc0ba90ed9271239c0c8a7bc14f06 (diff) | |
| download | haskell-f70fb6892f5fd32e6161e951aa3e804148afd2fe.tar.gz | |
Use -package-id to specify libraries on command line.
Summary:
There's not really any good reason to use -package-key over
-package-id, so use the latter as standard practice.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: austin
Subscribers: thomie, bgamari
Differential Revision: https://phabricator.haskell.org/D1000
| -rw-r--r-- | rules/distdir-way-opts.mk | 7 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 17 |
2 files changed, 12 insertions, 12 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 807309305d..7a4115cdd9 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -87,13 +87,12 @@ $4_USE_PACKAGE_KEY=NO endif endif -ifeq "$($4_USE_PACKAGE_KEY)" "NO" $1_$2_$4_DEP_OPTS = \ - $$(foreach pkg,$$($1_$2_DEPS),-package $$(pkg)) + $$(foreach pkg,$$($1_$2_DEP_IPIDS),-package-id $$(pkg)) + +ifeq "$($4_USE_PACKAGE_KEY)" "NO" $4_THIS_PACKAGE_KEY = -package-name else -$1_$2_$4_DEP_OPTS = \ - $$(foreach pkg,$$($1_$2_DEP_KEYS),-package-key $$(pkg)) $4_THIS_PACKAGE_KEY = -this-package-key endif diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 3c049fedf1..6302349a2a 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -396,17 +396,17 @@ generate directory distdir dll0Modules config_args dep_ids = map snd (externalPackageDeps lbi) deps = map display dep_ids + dep_direct = map (fromMaybe (error "ghc-cabal: dep_keys failed") + . PackageIndex.lookupInstalledPackageId + (installedPkgs lbi) + . fst) + . externalPackageDeps + $ lbi dep_keys | packageKeySupported comp - = map (display - . Installed.packageKey - . fromMaybe (error "ghc-cabal: dep_keys failed") - . PackageIndex.lookupInstalledPackageId - (installedPkgs lbi) - . fst) - . externalPackageDeps - $ lbi + = map (display . Installed.packageKey) dep_direct | otherwise = deps + dep_ipids = map (display . Installed.installedPackageId) dep_direct depNames = map (display . packageName) dep_ids transitive_dep_ids = map Installed.sourcePackageId dep_pkgs @@ -448,6 +448,7 @@ generate directory distdir dll0Modules config_args variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (hsSourceDirs bi), variablePrefix ++ "_DEPS = " ++ unwords deps, variablePrefix ++ "_DEP_KEYS = " ++ unwords dep_keys, + variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids, variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames, variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords transitiveDeps, variablePrefix ++ "_TRANSITIVE_DEP_KEYS = " ++ unwords transitiveDepKeys, |