diff options
| -rw-r--r-- | rules/build-package-data.mk | 6 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 8f3a8e7c71..a20afbca3f 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -32,11 +32,13 @@ endif $1_$2_CONFIGURE_OPTS += --disable-library-for-ghci ifeq "$$(filter v,$$($1_$2_WAYS))" "v" $1_$2_CONFIGURE_OPTS += --enable-library-vanilla +# Build the GHCi lib even if GHCi is dynamic (and therefore won't use +# these by default), because they will be used by +# (a) ghci -fexternal-interpreter +# (b) statically-linked binaries that use the GHC package ifeq "$$(GhcWithInterpreter)" "YES" -ifneq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" $1_$2_CONFIGURE_OPTS += --enable-library-for-ghci endif -endif else $1_$2_CONFIGURE_OPTS += --disable-library-vanilla endif diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 8f61a355eb..f230ef5a5c 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -143,9 +143,6 @@ endif endif # Build the GHCi library -ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" -$1_$2_GHCI_LIB = $$($1_$2_dyn_LIB) -else ifeq "$3" "v" $1_$2_GHCI_LIB = $1/$2/build/HS$$($1_$2_COMPONENT_ID).$$($3_osuf) ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" @@ -164,7 +161,6 @@ $(call all-target,$1_$2,$$($1_$2_GHCI_LIB)) endif endif # "$$($1_$2_BUILD_GHCI_LIB)" "YES" endif # "$3" "v" -endif # "$$(DYNAMIC_GHC_PROGRAMS)" "YES" $(call profEnd, build-package-way($1,$2,$3)) endef # build-package-way |