From acc2bdc717b4b24ec5b26a85cf3256a36a42d08b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 5 Jul 2008 14:03:54 +0000 Subject: [PATCH] gmp didn't really fit into the make boot/all cycle, so don't try to force it Now we just run make in it at the start of the stage1 build --- Makefile | 5 +++-- gmp/Makefile | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4d5b40e..9fc22c9 100644 --- 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 boot $(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 \ diff --git a/gmp/Makefile b/gmp/Makefile index 8f2097c..f194f66 100644 --- a/gmp/Makefile +++ b/gmp/Makefile @@ -43,13 +43,11 @@ else BUILD_SHARED=no endif -boot :: stamp.gmp.static BINDIST_STAMPS = stamp.gmp.static INSTALL_HEADERS += gmp.h INSTALL_LIBS += libgmp.a ifeq "$(BUILD_SHARED)" "yes" -boot :: stamp.gmp.shared BINDIST_STAMPS += stamp.gmp.shared INSTALL_LIBS += libgmp.dll.a INSTALL_PROGS += libgmp-3.dll -- 1.7.10.4