From: Ian Lynagh Date: Sun, 20 Jun 2010 16:37:24 +0000 (+0000) Subject: Check files are really created in libffi X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cbc65cfae5ba78dc73ee2c5209bf6cd6dac0b574 Check files are really created in libffi when we think that the libffi build creates them, so they just depend on the libffi build stamp. --- diff --git a/libffi/ghc.mk b/libffi/ghc.mk index a8c72be..10e2ee3 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -156,6 +156,8 @@ endif touch $@ $(libffi_STATIC_LIB): $(libffi_STAMP_BUILD) + [ -f $@ ] + # Rename libffi.a to libHSffi.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 @@ -178,6 +180,8 @@ $(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) + [ -f $@ ] + # 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 @@ -189,6 +193,8 @@ $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a)) else $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD) + [ -f $@ ] + # Rename libffi.so to libHSffi...so $(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/. "$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB)