Commit cbc65cfa authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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.
parent 8555754b
...@@ -156,6 +156,8 @@ endif ...@@ -156,6 +156,8 @@ endif
touch $@ touch $@
$(libffi_STATIC_LIB): $(libffi_STAMP_BUILD) $(libffi_STATIC_LIB): $(libffi_STAMP_BUILD)
[ -f $@ ]
# Rename libffi.a to libHSffi.a # 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/dist-install/build/libHSffi_p.a: $(libffi_STATIC_LIB)
"$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi.a "$(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)) ...@@ -178,6 +180,8 @@ $(eval $(call all-target,libffi,libffi/dist-install/build/HSffi.o))
ifeq "$(BuildSharedLibs)" "YES" ifeq "$(BuildSharedLibs)" "YES"
ifeq "$(Windows)" "YES" ifeq "$(Windows)" "YES"
libffi/libffi.dll.a $(libffi_HS_DYN_LIB): $(libffi_STAMP_BUILD) libffi/libffi.dll.a $(libffi_HS_DYN_LIB): $(libffi_STAMP_BUILD)
[ -f $@ ]
# Windows libtool creates <soname>.dll, and as we already patched that # Windows libtool creates <soname>.dll, and as we already patched that
# there is no need to copy from libffi.dll to libHSffi...dll. # there is no need to copy from libffi.dll to libHSffi...dll.
# However, the renaming is still required for the import library # However, the renaming is still required for the import library
...@@ -189,6 +193,8 @@ $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a)) ...@@ -189,6 +193,8 @@ $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a))
else else
$(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD) $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD)
[ -f $@ ]
# Rename libffi.so to libHSffi...so # Rename libffi.so to libHSffi...so
$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/. $(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/.
"$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB) "$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment