summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-11-18 15:05:08 +0000
committerIan Lynagh <igloo@earth.li>2009-11-18 15:05:08 +0000
commit142df90ad9ec1155129a01949775bf992c75f08f (patch)
tree434d41a98d68101a09b05b1073a26d8f01906af7 /ghc.mk
parent348350dff872d5b981d4d4b18641ec74d71d50ea (diff)
downloadhaskell-142df90ad9ec1155129a01949775bf992c75f08f.tar.gz
Put the libffi files to be installed into a dist directory
This meakes it easier to correctly clean libffi
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc.mk b/ghc.mk
index b21aac03f2..471fb4f00c 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -360,9 +360,9 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn
endif
BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
-OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o
+OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
ifeq "$(BuildSharedLibs)" "YES"
-OTHER_LIBS += libffi/libHSffi$(dyn_libsuf)
+OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf)
endif
# We cannot run ghc-cabal to configure a package until we have