summaryrefslogtreecommitdiff
path: root/rules/build-prog.mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-13 21:29:27 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-15 00:49:49 +0000
commitb7126674a5f4ead9c73a6a2cbe0fbc85f7d36c12 (patch)
tree767f78388d2e73d317a64d1c106402de6f9014ed /rules/build-prog.mk
parent5319ea79fa1572b7d411548532031f9d19b928c6 (diff)
downloadhaskell-b7126674a5f4ead9c73a6a2cbe0fbc85f7d36c12.tar.gz
By default, use the dynamic way for programs in the GHC tree
In particular, this means that GHCi will use DLLs, rather than loading object files itself.
Diffstat (limited to 'rules/build-prog.mk')
-rw-r--r--rules/build-prog.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 597315983d..81f2ef2ad9 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -64,7 +64,7 @@ else ifneq "$$($1_$2_INSTALL_INPLACE)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = NO
else ifeq "$$($1_$2_SHELL_WRAPPER)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = YES
-else ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES"
+else ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
$1_$2_WANT_INPLACE_WRAPPER = YES
else
$1_$2_WANT_INPLACE_WRAPPER = NO
@@ -136,7 +136,7 @@ $(call shell-wrapper,$1,$2)
ifeq "$$($1_$2_PROGRAM_WAY)" ""
ifeq "$3" "0"
$1_$2_PROGRAM_WAY = v
-else ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES"
+else ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
$1_$2_PROGRAM_WAY = dyn
else
$1_$2_PROGRAM_WAY = v