summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2014-08-13 11:30:26 +0100
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-08-13 15:33:14 +0100
commit2272c50a61c3dc43edf35b3eeb7997cc0f47eaf3 (patch)
tree3312733d435a38cff36bb700c1a73de53fe7571a /rules
parent5e46e1f5323a7fc09e9bbd9023d5c63e144e1ad3 (diff)
downloadhaskell-2272c50a61c3dc43edf35b3eeb7997cc0f47eaf3.tar.gz
Explicitly version test for package key support.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'rules')
-rw-r--r--rules/distdir-way-opts.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 898485c0ca..0a6d84e951 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -81,9 +81,15 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
# $1_$2_$3_MOST_HC_OPTS is also passed to C compilations when we use
# GHC as the C compiler.
+ifeq "$(SUPPORTS_PACKAGE_KEY)" "NO"
+ifeq "$4" "0"
+$4_USE_PACKAGE_KEY=NO
+endif
+endif
+
# ToDo: It would be more accurate to version test this against what version of
# GHC we're using to see if it understands package-key
-ifeq "$4" "0"
+ifeq "$($4_USE_PACKAGE_KEY)" "NO"
$1_$2_$4_DEP_OPTS = \
$$(foreach pkg,$$($1_$2_DEPS),-package $$(pkg))
$4_THIS_PACKAGE_KEY = -package-name