X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=3ff7d88b1cdf3c0293d37f34c2d3c9b8df4d7baf;hb=33fe71479b74a25ec28bd8f487f00a81b1e22a7f;hp=887df1d52598692ffbaf3c24a32ace9af5375200;hpb=31a2810db85c80e5df25b87f3766a815f4426872;p=ghc-hetmet.git diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 887df1d..3ff7d88 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -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