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 | |
| 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')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 2 | ||||
| -rw-r--r-- | rules/build-prog.mk | 4 | ||||
| -rw-r--r-- | rules/shell-wrapper.mk | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index bcd863fe62..cf67baf33c 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -22,7 +22,7 @@ $1_$2_CONFIGURE_OPTS += --disable-library-for-ghci ifeq "$$(filter v,$$($1_$2_WAYS))" "v" $1_$2_CONFIGURE_OPTS += --enable-library-vanilla ifeq "$$(GhcWithInterpreter)" "YES" -ifneq "$$(DYNAMIC_BY_DEFAULT)" "YES" +ifneq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" $1_$2_CONFIGURE_OPTS += --enable-library-for-ghci endif endif diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 8a0dc6409e..bae73e32d9 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -119,7 +119,7 @@ BINDIST_LIBS += $$($1_$2_$3_LIB0) endif # Build the GHCi library -ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" +ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" $1_$2_GHCI_LIB = $$($1_$2_dyn_LIB) else ifeq "$3" "v" 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 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+"$$$$@"}' >> $$@ |