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 /rules | |
| 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
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/distdir-way-opts.mk | 7 |
1 files changed, 3 insertions, 4 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 |