From 3f070beb602a1b40d185ec49f7b556a7cc624d51 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Mon, 10 Sep 2007 12:27:56 +0000
Subject: [PATCH] Turn off orphan warnings We also avoid using
 -fno-warn-orphans with older GHCs that don't understand the
 flag.

---
 compiler/Makefile       |    5 +++++
 compiler/cmm/Cmm.hs     |    4 ----
 compiler/cmm/PprCmmZ.hs |    3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/Makefile b/compiler/Makefile
index f9a0b58..342a1ab 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -166,6 +166,11 @@ odir=stage$(stage)
 SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
 
 SRC_HC_OPTS += -Wall -fno-warn-name-shadowing
+# Turn off orphan warnings, but only if the flag exists (i.e. not if we
+# are building stage 1 and using GHC < 6.3).
+ifneq "$(stage) $(ghc_ge_603)" "1 NO"
+SRC_HC_OPTS += -fno-warn-orphans
+endif
 
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index db5accd..afa47a2 100644
--- a/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
@@ -1,7 +1,3 @@
-{-# OPTIONS -fno-warn-name-shadowing -w #-}
--- We'd like to use -fno-warn-orphans rather than -w, but old compilers
--- don't understand it so building stage1 fails.
-
 -----------------------------------------------------------------------------
 --
 -- Cmm data types
diff --git a/compiler/cmm/PprCmmZ.hs b/compiler/cmm/PprCmmZ.hs
index 390bca6..d333b05 100644
--- a/compiler/cmm/PprCmmZ.hs
+++ b/compiler/cmm/PprCmmZ.hs
@@ -1,6 +1,5 @@
-{-# OPTIONS -Wall -fno-warn-name-shadowing -fno-warn-orphans #-}
 
-module PprCmmZ 
+module PprCmmZ
     ( pprCmmGraph
     )
 where
-- 
1.7.10.4