diff options
author | Ian Lynagh <ian@well-typed.com> | 2013-03-13 21:29:27 +0000 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2013-03-15 00:49:49 +0000 |
commit | b7126674a5f4ead9c73a6a2cbe0fbc85f7d36c12 (patch) | |
tree | 767f78388d2e73d317a64d1c106402de6f9014ed /rules/shell-wrapper.mk | |
parent | 5319ea79fa1572b7d411548532031f9d19b928c6 (diff) | |
download | haskell-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/shell-wrapper.mk')
-rw-r--r-- | rules/shell-wrapper.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 687c408348..4f6795d159 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -44,7 +44,7 @@ $$(INPLACE_WRAPPER): $$($1_$2_INPLACE) echo 'pgmgcc="$$(WhatGccIsCalled)"' >> $$@ $$($1_$2_SHELL_WRAPPER_EXTRA) $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA) -ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" +ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" echo '$$(call prependLibraryPath,$$($1_$2_DEP_LIB_DIRS_SEARCHPATH))' >> $$@ endif ifeq "$$($1_$2_SHELL_WRAPPER)" "YES" @@ -99,7 +99,7 @@ BINDIST_EXTRAS += $$($1_$2_BINDIST_WRAPPER) $$($1_$2_BINDIST_WRAPPER): $1/$2/build/tmp/$$($1_$2_PROG) $$(call removeFiles, $$@) echo '#!$$(SHELL)' >> $$@ -ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" +ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" echo '$$(call prependLibraryPath,$$($1_$2_DEP_LIB_REL_DIRS_SEARCHPATH))' >> $$@ endif echo 'exec "$$<" $$$${1+"$$$$@"}' >> $$@ |