From 4b8a6d6c34bd74a4e3ac4d5d3c19e1236b1882dd Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Mon, 12 Apr 2010 23:56:58 +0000
Subject: [PATCH] Remove the ghc_ge_609 makefile variables They are now
 guaranteed to be YES

---
 configure.ac                |    2 --
 ghc.mk                      |    2 --
 mk/config.mk.in             |    1 -
 rules/build-dependencies.mk |    4 ----
 rules/package-config.mk     |    2 --
 5 files changed, 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4eb022..9ab6b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,12 +125,10 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
-  if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
   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
diff --git a/ghc.mk b/ghc.mk
index f8f0937..1593c79 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -625,9 +625,7 @@ include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 
 # We need -fno-warn-deprecated-flags to avoid failure with -Werror
 GhcLibHcOpts += -fno-warn-deprecated-flags
-ifeq "$(ghc_ge_609)" "YES"
 GhcBootLibHcOpts += -fno-warn-deprecated-flags
-endif
 
 # Add $(GhcLibHcOpts) to all library builds
 $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts)))
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8df8e21..e6a30f4 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -499,7 +499,6 @@ 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@
diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 962c040..7a05803 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -17,11 +17,7 @@ $1_$2_depfile_c_asm = $$($1_$2_depfile_base).c_asm
 
 $1_$2_C_FILES_DEPS = $$(filter-out $$($1_$2_C_FILES_NODEPS),$$($1_$2_C_FILES))
 
-ifeq "$$($1_$2_ghc_ge_609)" "YES"
 $1_$2_MKDEPENDHS_FLAGS = -include-pkg-deps -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
-else
-$1_$2_MKDEPENDHS_FLAGS = -optdep--include-pkg-deps -optdep-f -optdep$$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-optdep-s -optdep$$(way))
-endif
 
 ifneq "$$($1_$2_NO_BUILD_DEPS)" "YES"
 
diff --git a/rules/package-config.mk b/rules/package-config.mk
index 5dff483..c30f117 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -17,7 +17,6 @@ $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)
@@ -37,7 +36,6 @@ 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.7.10.4