From 89158b9fb43f4835617857db1f7de26cc84c2192 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 5 Jul 2008 15:50:25 +0000 Subject: [PATCH] libffi now doesn't have an artificial make boot/all split --- Makefile | 5 +++-- libffi/Makefile | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 121546e..f65f2bd 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 = libffi includes rts compat compiler docs utils driver +SUBDIRS_BUILD = includes rts compat compiler docs utils driver else -SUBDIRS_BUILD = libffi includes compat utils driver docs compiler rts libraries/Cabal/doc +SUBDIRS_BUILD = 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 @@ -100,6 +100,7 @@ endif stage1 : $(GCC_LIB_DEP) check-packages $(MAKE) -C libraries boot $(MAKE) -C gmp all + $(MAKE) -C libffi 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 \ diff --git a/libffi/Makefile b/libffi/Makefile index bd9e658..d545a68 100644 --- a/libffi/Makefile +++ b/libffi/Makefile @@ -39,13 +39,11 @@ else BUILD_SHARED=no endif -boot :: stamp.ffi.static BINDIST_STAMPS = stamp.ffi.static INSTALL_HEADERS += ffi.h INSTALL_LIBS += libffi.a ifeq "$(BUILD_SHARED)" "yes" -boot :: stamp.ffi.shared BINDIST_STAMPS += stamp.ffi.shared INSTALL_LIBS += libffi.dll.a INSTALL_PROGS += libffi-3.dll -- 1.7.10.4