Set more env variables when configuring libffi

[ghc-hetmet.git] / libffi / ghc.mk

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 12a67db..d9b1c01 100644 (file)
--- 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
@@ -126,6 +127,9 @@ $(libffi_STAMP_CONFIGURE):
            export PATH; \
            cd build && \
            CC=$(WhatGccIsCalled) \
+           LD=$(LD) \
+           AR=$(AR) \
+           NM=$(NM) \
         CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS) -w" \
         LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS) -w" \
         "$(SHELL)" configure \