INSTALL_HEADERS += libffi/ffi.h
libffi_STATIC_LIB = libffi/libffi.a
-INSTALL_LIBS += libffi/libHSffi.a libffi/HSffi.o
+INSTALL_LIBS += libffi/libHSffi.a libffi/libHSffi_p.a libffi/HSffi.o
# We have to add the GHC version to the name of our dynamic libs, because
# they will be residing in the system location along with dynamic libs from
libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
else
libffi_DYNAMIC_PROG =
-libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.7
+libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.9
endif
ifeq "$(BuildSharedLibs)" "YES"
ifneq "$(BINDIST)" "YES"
$(libffi_STAMP_CONFIGURE):
"$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build
- cd libffi && $(TAR) -zxf tarball/libffi*.tar.gz
+ cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz
mv libffi/libffi-* libffi/build
chmod +x libffi/ln
cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
export PATH; \
cd build && \
CC=$(WhatGccIsCalled) \
- CFLAGS="$(SRC_CC_OPTS) -w" \
- LDFLAGS="$(SRC_LD_OPTS) -w" \
+ CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS) -w" \
+ LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS) -w" \
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
libffi/HSffi.o: libffi/libHSffi.a
cd libffi && \
touch empty.c; \
- "$(CC)" $(SRC_CC_OPTS) -c empty.c -o HSffi.o
+ "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) -c empty.c -o HSffi.o
$(eval $(call all-target,libffi,libffi/HSffi.o))