X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=patches%2Fpatch-aa;h=14b0424f6720df4fe99d2f44faf21dc75ec920cd;hb=325bb91ccc5d8e4974255df8b066db5f8b0f1d11;hp=e517d8c10a73dee380d01f194b0d971f57b8955a;hpb=ce139a0445754a5ef695190b91f2d6d3d815869f;p=pkgsrc-ghc.git

diff --git a/patches/patch-aa b/patches/patch-aa
index e517d8c..14b0424 100644
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.8 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD$
 
---- ../ghc-6.4.2/ghc/Makefile.orig	2006-07-30 14:26:56.000000000 +0200
-+++ ../ghc-6.4.2/ghc/Makefile	2006-07-30 14:27:26.000000000 +0200
-@@ -22,7 +22,7 @@
- # we descend into subdirs - to boot utils must be before driver.
- #
- ifeq "$(BootingFromHc)" "YES"
--SUBDIRS = includes rts docs compiler lib utils driver
-+SUBDIRS = includes rts docs lib compiler utils driver
- else
- ifneq "$(ILXized)" "YES"
- SUBDIRS = includes lib utils driver docs compiler rts
+--- rts/ghc.mk.orig	2009-12-11 03:11:33.000000000 +0900
++++ rts/ghc.mk
+@@ -19,8 +19,8 @@ rts_dist_HC = $(GHC_STAGE1)
+ # merge GhcLibWays and GhcRTSWays but strip out duplicates
+ rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
+ 
+-ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \
+-	       rts/dist/build/libHSrtsmain.a
++ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
++
+ all_rts : $(ALL_RTS_LIBS)
+ 
+ # -----------------------------------------------------------------------------