Need to make all in gmp, not boot

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index c4ff13c..121546e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,9 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = libffi includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
 SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
@@ -99,6 +99,7 @@ endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
        $(MAKE) -C libraries boot
+       $(MAKE) -C gmp       all
        $(MAKE) -C utils/mkdependC boot
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
        for i in $(SUBDIRS_BUILD); do \
@@ -467,7 +468,7 @@ SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib libraries
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
        aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
-       ghc.spec.in extra-gcc-opts.in VERSION boot
+       ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot
 
 # -----------------------------------------------------------------------------
 # Source distributions
@@ -557,7 +558,7 @@ hc-file-bundle :
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
-       ghc.spec docs/users_guide/ug-book.xml extra-gcc-opts
+       docs/users_guide/ug-book.xml extra-gcc-opts
 
 # don't clean config.mk: it's needed when cleaning stuff later on
 LATE_DIST_CLEAN_FILES += mk/config.mk