Commit e295322d authored by Simon Marlow's avatar Simon Marlow
Browse files

Fix a problem with package.mk being included too early

parent b802bbad
......@@ -861,35 +861,6 @@ docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $
$(MAKE) -f Makefile.ghcbin $(MFLAGS) $@
endif
include $(TOP)/mk/package.mk
#-----------------------------------------------------------------------------
# binary-dist
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
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
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
ifneq "$(INSTALL_PROGS)" ""
set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
endif
ifneq "$(INSTALL_LIBEXECS)" ""
set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
endif
#-----------------------------------------------------------------------------
# clean
......@@ -919,6 +890,33 @@ include $(TOP)/mk/target.mk
$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
#-----------------------------------------------------------------------------
# binary-dist
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
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
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
ifneq "$(INSTALL_PROGS)" ""
set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
endif
ifneq "$(INSTALL_LIBEXECS)" ""
set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
endif
# -----------------------------------------------------------------------------
# Explicit dependencies
......
......@@ -39,6 +39,13 @@
PRE_SRCS := $(ALL_SRCS)
##################################################################
# Include package building machinery
# NB. needs to be after PRE_SRCS setting above, because otherwise the
# rule dependencies won't be set correctly.
include $(TOP)/mk/package.mk
###################################################################
# Suffix rules for Haskell, C and literate
......
......@@ -387,8 +387,6 @@ ifneq "$(BootingFromHc)" "YES"
$(HC) $(HC_OPTS) -S $< -o $@
endif
include $(TOP)/mk/package.mk
#-----------------------------------------------------------------------------
#
# Files to install
......@@ -404,6 +402,8 @@ endif
#
# binary-dist
include $(TOP)/mk/target.mk
binary-dist:
$(INSTALL_DIR) $(BIN_DIST_DIR)/rts
$(INSTALL_DIR) $(BIN_DIST_DIR)/rts/gmp
......@@ -415,5 +415,3 @@ endif
ifneq "$(INSTALL_LIBEXECS)" ""
$(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/
endif
include $(TOP)/mk/target.mk
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