diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-11-27 17:30:00 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-11-27 17:30:00 +0000 |
| commit | 9142c238bd014c45e30fc79eee69fa6ab3f469d8 (patch) | |
| tree | b67c39856302f48740f06894284ad064ddcffadb /rules | |
| parent | 71d0e9a03797a194209cb61b7f75c2e1c8ddf237 (diff) | |
| download | haskell-9142c238bd014c45e30fc79eee69fa6ab3f469d8.tar.gz | |
Always enable the archive-loading code
If the GHCi .o lib doesn't exist, load the .a instead
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 2ed47e1499..9b8474a248 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -25,7 +25,7 @@ ifeq "$$(filter dyn,$$(GhcLibWays))" "dyn" $1_$2_CONFIGURE_OPTS += --enable-shared endif -ifeq "$$(GhcWithInterpreter) $$(UseArchivesForGhci)" "YES NO" +ifeq "$$(GhcWithInterpreter)" "YES" $1_$2_CONFIGURE_OPTS += --enable-library-for-ghci else $1_$2_CONFIGURE_OPTS += --disable-library-for-ghci diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index d829a001a1..ed81d6d532 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -102,19 +102,23 @@ endif # Build the GHCi library 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" # Don't put bootstrapping packages in the bindist ifneq "$4" "0" -ifeq "$$(UseArchivesForGhci)" "NO" BINDIST_LIBS += $$($1_$2_GHCI_LIB) endif endif $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) -ifeq "$$(UseArchivesForGhci)" "NO" +ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" +# Don't bother making ghci libs for bootstrapping packages +ifneq "$4" "0" +# $$(info Here $1 $2 $$($1_$2_BUILD_GHCI_LIB) Q1) $(call all-target,$1_$2,$$($1_$2_GHCI_LIB)) endif endif +endif endef |