X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libffi%2Fghc.mk;h=eaffa3fc7fdd24ee1df813f23cfc1073372444ce;hp=3f101dffedd38a7a9c365b5284f6ed87dc2846d3;hb=190b2d90f92f61eb802275729106b5d9fb9a7a7c;hpb=22c42ec32752ea67b5071df32fd9997a3f4d7346 diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 3f101df..eaffa3f 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -36,19 +36,6 @@ PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g') -# 2007-09-26 -# set -o igncr -# is not a valid command on non-Cygwin-systems. -# Let it fail silently instead of aborting the build. -# -# 2007-07-05 -# We do -# set -o igncr; export SHELLOPTS -# here as otherwise checking the size of limbs -# makes the build fall over on Cygwin. See the thread -# http://www.cygwin.com/ml/cygwin/2006-12/msg00011.html -# for more details. - # 2007-07-05 # Passing # as_ln_s='cp -p' @@ -66,23 +53,34 @@ endif BINDIST_STAMPS = libffi/stamp.ffi.build libfii/stamp.ffi.configure -INSTALL_HEADERS += libffi/ffi.h -libffi_STATIC_LIB = libffi/libffi.a -INSTALL_LIBS += libffi/libHSffi.a libffi/HSffi.o +INSTALL_HEADERS += libffi/dist-install/build/ffi.h \ + libffi/dist-install/build/ffitarget.h +libffi_STATIC_LIB = libffi/dist-install/build/libffi.a +INSTALL_LIBS += libffi/dist-install/build/libHSffi.a \ + libffi/dist-install/build/libHSffi_p.a \ + libffi/dist-install/build/HSffi.o # We have to add the GHC version to the name of our dynamic libs, because # they will be residing in the system location along with dynamic libs from # other GHC installations. libffi_HS_DYN_LIB_NAME = libHSffi$(dyn_libsuf) -libffi_HS_DYN_LIB = libffi/$(libffi_HS_DYN_LIB_NAME) +libffi_HS_DYN_LIB = libffi/dist-install/build/$(libffi_HS_DYN_LIB_NAME) ifeq "$(Windows)" "YES" libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB) else libffi_DYNAMIC_PROG = -libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.7 +ifeq "$(darwin_TARGET_OS)" "1" +libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) \ + libffi/dist-install/build/libffi.5$(soext) +else ifeq "$(openbsd_TARGET_OS)" "1" +libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so.5.10 +else +libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \ + libffi/dist-install/build/libffi.so.5 +endif endif ifeq "$(BuildSharedLibs)" "YES" @@ -105,25 +103,23 @@ endif ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): - "$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build - cd libffi && $(TAR) -zxf tarball/libffi*.tar.gz + "$(RM)" $(RM_OPTS_REC) $(LIBFFI_DIR) libffi/build + cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; } mv libffi/libffi-* libffi/build chmod +x libffi/ln - cd libffi && $(PATCH) -p0 < libffi.dllize-3.0.6.patch - - # This patch is just the resulting delta from running automake, autoreconf, libtoolize --force --copy - cd libffi && "$(PATCH)" -p0 < libffi.autotools-update.patch # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn # warnings off or the compilation of libffi might fail due to warnings cd libffi && \ - (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \ PATH=`pwd`:$$PATH; \ export PATH; \ cd build && \ CC=$(WhatGccIsCalled) \ - CFLAGS="$(SRC_CC_OPTS) -w" \ - LDFLAGS="$(SRC_LD_OPTS) -w" \ + LD=$(LD) \ + AR=$(AR) \ + NM=$(NM) \ + CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -w" \ + LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS_STAGE1) -w" \ "$(SHELL)" configure \ --enable-static=yes \ --enable-shared=$(libffi_EnableShared) \ @@ -143,63 +139,78 @@ $(libffi_STAMP_CONFIGURE): touch $@ -libffi/ffi.h: $(libffi_STAMP_CONFIGURE) +libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/. "$(CP)" libffi/build/include/ffi.h $@ -$(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) - cd libffi && \ - $(MAKE) -C build MAKEFLAGS=; \ - (cd build; ./libtool --mode=install cp libffi.la $(TOP)/libffi) +libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/. + "$(CP)" libffi/build/include/ffitarget.h $@ + +$(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/. + $(MAKE) -C libffi/build MAKEFLAGS= + cd libffi/build && ./libtool --mode=install cp libffi.la $(TOP)/libffi/dist-install/build + + # We actually want both static and dllized libraries, because we build + # the runtime system both ways. libffi_convenience.a is the static version. +ifeq "$(Windows)" "YES" + cp libffi/build/.libs/libffi_convenience.a $(libffi_STATIC_LIB) +endif + touch $@ $(libffi_STATIC_LIB): $(libffi_STAMP_BUILD) + @test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; } + # Rename libffi.a to libHSffi.a -libffi/libHSffi.a libffi/libHSffi_p.a: $(libffi_STATIC_LIB) - "$(CP)" $(libffi_STATIC_LIB) libffi/libHSffi.a - "$(CP)" $(libffi_STATIC_LIB) libffi/libHSffi_p.a +libffi/dist-install/build/libHSffi.a libffi/dist-install/build/libHSffi_p.a: $(libffi_STATIC_LIB) + "$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi.a + "$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi_p.a -$(eval $(call all-target,libffi,libffi/libHSffi.a libffi/libHSffi_p.a)) +$(eval $(call all-target,libffi,$(INSTALL_HEADERS) $(INSTALL_LIBS))) # The GHCi import lib isn't needed as compiler/ghci/Linker.lhs + rts/Linker.c # link the interpreted references to FFI to the compiled FFI. # Instead of adding libffi to the list preloaded packages (see # compiler/ghci/Linker.lhs:emptyPLS) we generate an empty HSffi.o -libffi/HSffi.o: libffi/libHSffi.a - cd libffi && \ - touch empty.c; \ - "$(CC)" $(SRC_CC_OPTS) -c empty.c -o HSffi.o +libffi/dist-install/build/HSffi.o: libffi/dist-install/build/libHSffi.a + cd libffi/dist-install/build && \ + touch empty.c && \ + "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -c empty.c -o HSffi.o -$(eval $(call all-target,libffi,libffi/HSffi.o)) +$(eval $(call all-target,libffi,libffi/dist-install/build/HSffi.o)) ifeq "$(BuildSharedLibs)" "YES" ifeq "$(Windows)" "YES" libffi/libffi.dll.a $(libffi_HS_DYN_LIB): $(libffi_STAMP_BUILD) + @test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; } + # Windows libtool creates .dll, and as we already patched that # there is no need to copy from libffi.dll to libHSffi...dll. # However, the renaming is still required for the import library # libffi.dll.a. -$(libffi_HS_DYN_LIB).a: libffi/libffi.dll.a - "$(CP)" libffi/libffi.dll.a $(libffi_HS_DYN_LIB).a +$(libffi_HS_DYN_LIB).a: libffi/dist-install/build/libffi.dll.a | $$(dir $$@)/. + "$(CP)" $< $@ $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a)) else $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD) + @test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; } + # Rename libffi.so to libHSffi...so -$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) +$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/. "$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB) +ifeq "$(darwin_TARGET_OS)" "1" + # Ensure library's install name is correct before anyone links with it. + install_name_tool -id $(ghclibdir)/$(libffi_HS_DYN_LIB_NAME) $(libffi_HS_DYN_LIB) +endif $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB))) endif endif $(eval $(call clean-target,libffi,, \ - libffi/build libffi/stamp.ffi.* libffi/ffi.h libffi/empty.c \ - libffi/libffi.a libffi/libffi.la \ - libffi/HSffi.o libffi/libHSffi.a libffi/libHSffi_p.a \ - $(libffi_DYNAMIC_PROG) $(libffi_DYNAMIC_LIBS) \ - $(libffi_HS_DYN_LIB) $(libffi_HS_DYN_LIB).a)) + libffi/build libffi/stamp.ffi.* libffi/dist-install)) endif #-----------------------------------------------------------------------------