diff options
Diffstat (limited to 'lang/ghc/files/patch-ghc.mk')
| -rw-r--r-- | lang/ghc/files/patch-ghc.mk | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk index a8e806b6e47c..5467a7ae909b 100644 --- a/lang/ghc/files/patch-ghc.mk +++ b/lang/ghc/files/patch-ghc.mk @@ -1,38 +1,10 @@ ---- ghc.mk.orig 2013-04-18 23:22:46.000000000 +0200 -+++ ghc.mk 2013-04-29 20:42:16.000000000 +0200 -@@ -80,6 +80,7 @@ +--- ./ghc.mk.orig 2014-07-10 06:27:16.000000000 +0200 ++++ ./ghc.mk 2014-07-11 10:28:11.000000000 +0200 +@@ -96,6 +96,7 @@ # Catch make if it runs away into an infinite loop ifeq "$(MAKE_RESTARTS)" "" else ifeq "$(MAKE_RESTARTS)" "1" +else ifeq "$(MAKE_RESTARTS)" "2" else - $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?) + $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details) endif -@@ -595,12 +596,18 @@ - MAYBE_GHCI=driver/ghci - endif - -+ifeq "$(UseSystemLibFFI)" "YES" -+MAYBE_LIBFFI= -+else -+MAYBE_LIBFFI=libffi -+endif -+ - BUILD_DIRS += \ - driver \ - $(MAYBE_GHCI) \ - driver/ghc \ - driver/haddock \ -- libffi \ -+ $(MAYBE_LIBFFI) \ - includes \ - rts - -@@ -1005,6 +1012,7 @@ - echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) - echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) - echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK) -+ echo "UseSystemLibFFI = $(UseSystemLibFFI)" >> $(BIN_DIST_MK) - cd $(BIN_DIST_PREP_DIR) && autoreconf - $(call removeFiles,$(BIN_DIST_PREP_TAR)) - # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source |