From d501b54611ab436563fda72f171c7489c1b41630 Mon Sep 17 00:00:00 2001
From: rrt <unknown>
Date: Wed, 28 Feb 2001 10:53:30 +0000
Subject: [PATCH] [project @ 2001-02-28 10:53:30 by rrt] Modernize

---
 ghc/tests/deriving/should_compile/Makefile |    2 +-
 ghc/tests/deriving/should_run/Makefile     |    2 ++
 ghc/tests/deriving/should_run/drvrun008.hs |    3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ghc/tests/deriving/should_compile/Makefile b/ghc/tests/deriving/should_compile/Makefile
index d2bdb36..5144794 100644
--- a/ghc/tests/deriving/should_compile/Makefile
+++ b/ghc/tests/deriving/should_compile/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-SRC_HC_OPTS += -dcore-lint -nohi
+SRC_HC_OPTS += -dcore-lint
 
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/deriving/should_run/Makefile b/ghc/tests/deriving/should_run/Makefile
index d39565d..1723332 100644
--- a/ghc/tests/deriving/should_run/Makefile
+++ b/ghc/tests/deriving/should_run/Makefile
@@ -4,6 +4,8 @@ include $(TOP)/mk/should_run.mk
 
 SRC_HC_OPTS += -dcore-lint
 
+drvrun008_HC_OPTS += -funbox-strict-fields
+
 drvrun005_RUNTEST_OPTS += -fail
 
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/deriving/should_run/drvrun008.hs b/ghc/tests/deriving/should_run/drvrun008.hs
index 5a857d0..7fe7799 100644
--- a/ghc/tests/deriving/should_run/drvrun008.hs
+++ b/ghc/tests/deriving/should_run/drvrun008.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS -funbox-strict-fields #-}
--- !!! Check that -funbox-strict-fields doesn't mess up deriving
+-- !!! Check that -funbox-strict-fields doesn't mess up deriving (can't be in an options pragma, it's in the Makefile)
 -- !!!  (it did in 4.04)
 
 module Main( main ) where
-- 
1.7.10.4