summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-10-13 16:52:48 +0100
committerIan Lynagh <ian@well-typed.com>2012-10-13 16:52:48 +0100
commit22df9533d0a0a51268135ce46c0ca9ffcbbaa82a (patch)
treea4563c3ab963afe848a517630c3275ce22f22f54
parentbe497c202b790999c3fd0ddc4a4176b8cf6acf7e (diff)
downloadhaskell-22df9533d0a0a51268135ce46c0ca9ffcbbaa82a.tar.gz
Fix test for GHCi lib building
-rw-r--r--rules/build-package-way.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index 722f8bf988..9420aa4f93 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -113,7 +113,9 @@ BINDIST_LIBS += $$($1_$2_$3_LIB)
endif
# Build the GHCi library
-ifneq "$$(DYNLIBS_BY_DEFAULT)" "YES"
+ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES"
+$1_$2_GHCI_LIB = $$($1_$2_dyn_LIB)
+else
ifeq "$3" "v"
$1_$2_GHCI_LIB = $1/$2/build/HS$$($1_PACKAGE)-$$($1_$2_VERSION).$$($3_osuf)
ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES"