From: Ian Lynagh <igloo@earth.li>
Date: Sun, 14 Mar 2010 17:20:18 +0000 (+0000)
Subject: When compiling with GHC >= 6.13, use -rtsopts
X-Git-Tag: 2010-03-16~2
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=0f183f73e2ad22b2a2225a388d024e0559862c66

When compiling with GHC >= 6.13, use -rtsopts
---

diff --git a/configure.ac b/configure.ac
index 4cacfd6..849b185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,9 +129,11 @@ if test "$WithGhc" != ""; then
   FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2],
                       [ghc_ge_6102=YES], [ghc_ge_6102=NO])
   if test $GhcCanonVersion -ge 611; then ghc_ge_611=YES; else ghc_ge_611=NO; fi
+  if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi
   AC_SUBST(ghc_ge_609)dnl
   AC_SUBST(ghc_ge_6102)dnl
   AC_SUBST(ghc_ge_611)dnl
+  AC_SUBST(ghc_ge_613)dnl
 fi
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1c59048..043472a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -496,9 +496,11 @@ GhcPatchLevel	= @GhcPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
+# Keep this in sync with the variables in package-config.mk
 ghc_ge_609 = @ghc_ge_609@
 ghc_ge_6102 = @ghc_ge_6102@
 ghc_ge_611 = @ghc_ge_611@
+ghc_ge_613 = @ghc_ge_613@
 
 # Canonicalised ghc version number, used for easy (integer) version
 # comparisons.  We must expand $(GhcMinVersion) to two digits by
diff --git a/rules/package-config.mk b/rules/package-config.mk
index 726a441..5dff483 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -18,6 +18,9 @@ $1_$2_HC = $$(GHC_STAGE$3)
 # configuration stuff that depends on which GHC we're building with
 ifeq "$3" "0"
 $1_$2_ghc_ge_609 = $$(ghc_ge_609)
+$1_$2_ghc_ge_6102 = $$(ghc_ge_6102)
+$1_$2_ghc_ge_611 = $$(ghc_ge_611)
+$1_$2_ghc_ge_613 = $$(ghc_ge_613)
 $1_$2_HC_CONFIG = $$(GHC_STAGE0)
 $1_$2_HC_CONFIG_DEP =
 $1_$2_GHC_PKG = $$(GHC_PKG)
@@ -30,8 +33,14 @@ $1_$2_HC_DEP =
 $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
 $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
 $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
+ifeq "$(ghc_ge_613)" "YES"
+$1_$2_HC_OPTS += -rtsopts
+endif
 else
 $1_$2_ghc_ge_609 = YES
+$1_$2_ghc_ge_6102 = YES
+$1_$2_ghc_ge_611 = YES
+$1_$2_ghc_ge_613 = YES
 $1_$2_HC_PKGCONF = 
 $1_$2_HC_CONFIG = $$(TOP)/$$(DUMMY_GHC_INPLACE)
 $1_$2_HC_CONFIG_DEP = $$(DUMMY_GHC_INPLACE)
@@ -44,6 +53,7 @@ $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1)
 $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND)
 $1_$2_HC_DEP = $$($1_$2_HC)
 $1_$2_HC_OPTS += -no-user-package-conf
+$1_$2_HC_OPTS += -rtsopts
 endif
 
 # Useful later