Commit da6f42a2 authored by Ian Lynagh's avatar Ian Lynagh

Fix the ghc package in bindists

parent 8f4c823a
......@@ -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
......
......@@ -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
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment