X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=8d452b37138502840e130a8ebaca750d9b452221;hb=2febde47a9d53c141fedb9e56bc59ce739c96dce;hp=a41512a983bd172d534582f3c28a6403eec6427d;hpb=5b9c4a01ed7539b4f894c491178962ecb7295c4e;p=ghc-hetmet.git diff --git a/libffi/ghc.mk b/libffi/ghc.mk index a41512a..8d452b3 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -86,7 +86,8 @@ libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB) else libffi_DYNAMIC_PROG = ifeq "$(darwin_TARGET_OS)" "1" -libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) libffi/dist-install/build/libffi.5$(soext) libffi/dist-install/build/libffi.5.0.9$(soext) +libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) \ + libffi/dist-install/build/libffi.5$(soext) else libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \ libffi/dist-install/build/libffi.so.5 @@ -113,7 +114,7 @@ endif ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): - "$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build + "$(RM)" $(RM_OPTS_REC) $(LIBFFI_DIR) libffi/build cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP) -d | { cd libffi && $(TAR) -xf - ; } mv libffi/libffi-* libffi/build chmod +x libffi/ln