diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-06-09 13:43:02 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-06-09 13:43:02 +0000 |
| commit | da6f42a2bb231bae3fdbe06350db26e2cdee2c34 (patch) | |
| tree | 669f69e176c69bb442254642e38736917298d1b9 | |
| parent | 8f4c823a0a5f8d730eff0fc2ee5e12cb248c0caa (diff) | |
| download | haskell-da6f42a2bb231bae3fdbe06350db26e2cdee2c34.tar.gz | |
Fix the ghc package in bindists
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | compiler/Makefile | 11 | ||||
| -rw-r--r-- | rts/Makefile | 4 |
3 files changed, 14 insertions, 4 deletions
@@ -282,6 +282,9 @@ binary-dist:: echo "ProjectVersion = $(ProjectVersion)" >> $(VARFILE) echo "HaveLibGmp = $(HaveLibGmp)" >> $(VARFILE) echo "GhcLibsWithUnix = $(GhcLibsWithUnix)" >> $(VARFILE) + echo "GhcWithInterpreter = $(GhcWithInterpreter)" >> $(VARFILE) + echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE) + echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE) cat distrib/Makefile-bin-vars.in >> $(VARFILE) @echo "Generating a shippable configure script.." $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac diff --git a/compiler/Makefile b/compiler/Makefile index 6c53f492db..a48e0d8c51 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -912,10 +912,11 @@ include $(TOP)/mk/package.mk #----------------------------------------------------------------------------- # binary-dist -# $(error Q$(INSTALL_PROGS)W) -foo: - echo Q$(INSTALL_PROGS)W$(GHC_PROG)E - echo Q$(INSTALL_LIBEXECS)W$(GHC_PROG)E +ifeq "$(DOING_BIN_DIST)" "YES" +# This is derived from the sources when we are in a source tree, but we +# don't have any sources in a bindist, so we have to shortcut it +HS_IFACES := $(wildcard stage$(stage)/*/*.hi) +endif binary-dist: $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler @@ -923,6 +924,8 @@ binary-dist: echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/ + set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done + set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done ifneq "$(INSTALL_LIBS)" "" set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done endif diff --git a/rts/Makefile b/rts/Makefile index 1eebfd6c40..7930fa75bb 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -207,6 +207,8 @@ SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG # We want a slightly different version for the unregisterised way, so we make # AutoApply on a per-way basis (eg. AutoApply_p.cmm). +ifneq "$(DOING_BIN_DIST)" "YES" + AUTO_APPLY_CMM = AutoApply$(_way).cmm ifneq "$(BootingFromHc)" "YES" @@ -219,6 +221,8 @@ EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM) CLEAN_FILES += $(AUTO_APPLY_CMM) +endif + # ----------------------------------------------------------------------------- # # Building DLLs is only supported on mingw32 at the moment. |