From eb675b52615870c462aa34dce559d1597fdfcce5 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 15 Jan 2011 20:21:04 +0000 Subject: [PATCH] Fix libffi build rules Fixes a rare race when both libHSffi.a and libHSffi_p.a were being built at the same time: "cp" libffi/dist-install/build/libffi.a libffi/dist-install/build/libHSffi.a "cp" libffi/dist-install/build/libffi.a libffi/dist-install/build/libHSffi.a "cp" libffi/dist-install/build/libffi.so libffi/dist-install/build/libHSffi-ghc7.1.20110115.so cp: cannot create regular file `libffi/dist-install/build/libHSffi.a': File exists --- libffi/ghc.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 887df1d..f207eb0 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))) -- 1.7.10.4