X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=3ff7d88b1cdf3c0293d37f34c2d3c9b8df4d7baf;hb=5775d5142da227d65fb86994d363eb16841ee642;hp=df5513f4f119205e92a97fde11f0d43054247d29;hpb=a0e733be73d2e57d8cd5f332c5e3f4fc3f73098e;p=ghc-hetmet.git diff --git a/libffi/ghc.mk b/libffi/ghc.mk index df5513f..3ff7d88 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -139,7 +139,7 @@ $(libffi_STAMP_CONFIGURE): touch $@ -libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/ffitarget.h $$(dir $$@)/. +libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) libffi/dist-install/build/ffitarget.h | $$(dir $$@)/. "$(CP)" libffi/build/include/ffi.h $@ libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/. @@ -161,8 +161,10 @@ $(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/dist-install/build/libHSffi.a libffi/dist-install/build/libHSffi_p.a: $(libffi_STATIC_LIB) +libffi/dist-install/build/libHSffi.a: $(libffi_STATIC_LIB) "$(CP)" $(libffi_STATIC_LIB) 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_p.a $(eval $(call all-target,libffi,$(INSTALL_HEADERS) $(INSTALL_LIBS))) @@ -181,7 +183,7 @@ $(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) +libffi/dist-install/build/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