[commit: ghc] master: Remove a redundant build-system hack (93494bd)

Ian Lynagh igloo at earth.li
Sat Apr 6 21:37:19 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/93494bdb36fb6cdb910d9600b5512c185db33583

>---------------------------------------------------------------

commit 93494bdb36fb6cdb910d9600b5512c185db33583
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Apr 6 18:59:42 2013 +0100

    Remove a redundant build-system hack
    
    We used to have to explicitly pass -lffi when linking the compiler,
    but it's no longer necessary.

>---------------------------------------------------------------

 compiler/ghc.mk | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 353117c..74bea9a 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -496,17 +496,6 @@ ifneq "$(UseSystemLibFFI)" "YES"
 compiler/stage2/build/LibFFI.hs : $(libffi_HEADERS)
 endif
 
-# On Windows it seems we also need to link directly to libffi
-ifeq "$(HostOS_CPP)" "mingw32"
-define windowsDynLinkToFfi
-# $1 = way
-ifneq "$$(findstring dyn, $1)" ""
-compiler_stage2_$1_ALL_HC_OPTS += -l$$(LIBFFI_WINDOWS_LIB)
-endif
-endef
-$(foreach way,$(GhcLibWays),$(eval $(call windowsDynLinkToFfi,$(way))))
-endif
-
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.





More information about the ghc-commits mailing list