[project @ 1998-07-08 10:36:45 by simonm]

'make boot' fixes.

diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile
index 5742a71..bc00ca6 100644 (file)
--- a/ghc/tests/codeGen/should_run/Makefile
+++ b/ghc/tests/codeGen/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.6 1998/07/02 08:46:15 simonm Exp $
+# $Id: Makefile,v 1.7 1998/07/08 10:36:45 simonm Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -25,4 +25,7 @@ cg021_RUNTEST_OPTS = +RTS -K2m
 cg025_RUNTEST_OPTS = -x 1 cg025.hs
 cg045_RUNTEST_OPTS = -x 1
 
+# mkdependHS doesn't understand OPTIONS pragmas...
+SRC_MKDEPENDHS_OPTS += -fglasgow-exts
+
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/deSugar/should_compile/Makefile b/ghc/tests/deSugar/should_compile/Makefile
index 735b987..034b977 100644 (file)
--- a/ghc/tests/deSugar/should_compile/Makefile
+++ b/ghc/tests/deSugar/should_compile/Makefile
@@ -6,6 +6,9 @@ SRC_HC_OPTS += -noC -dcore-lint
 
 ds035_HC_OPTS = -fglasgow-exts
 
+# mkdependHS doesn't understand OPTIONS pragmas...
+SRC_MKDEPENDHS_OPTS += -fglasgow-exts
+
 include $(TOP)/mk/target.mk
 
 

diff --git a/ghc/tests/lib/should_run/Makefile b/ghc/tests/lib/should_run/Makefile
index 0a1d7e1..0f59dc7 100644 (file)
--- a/ghc/tests/lib/should_run/Makefile
+++ b/ghc/tests/lib/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 1998/05/22 11:47:25 simonm Exp $
+# $Id: Makefile,v 1.2 1998/07/08 10:36:54 simonm Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -9,5 +9,7 @@ SRC_HC_OPTS += -dcore-lint
 
 packedstring001_HC_OPTS = -syslib misc
 
+SRC_MKDEPENDHS_OPTS += -syslib misc
+
 include $(TOP)/mk/target.mk
 

diff --git a/ghc/tests/numeric/should_run/Makefile b/ghc/tests/numeric/should_run/Makefile
index e5e3675..973388d 100644 (file)
--- a/ghc/tests/numeric/should_run/Makefile
+++ b/ghc/tests/numeric/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.2 1998/04/17 15:59:29 simonm Exp $
+# $Id: Makefile,v 1.3 1998/07/08 10:36:54 simonm Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -10,4 +10,6 @@ HC_OPTS += -dcore-lint
 arith011_HC_OPTS = -fglasgow-exts
 arith012_HC_OPTS = -fglasgow-exts
 
+SRC_MKDEPENDHS_OPTS += -fglasgow-exts
+
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/typecheck/should_compile/tc085.hs b/ghc/tests/typecheck/should_compile/tc085.hs
index 445d4cb..7bfefe6 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc085.hs
+++ b/ghc/tests/typecheck/should_compile/tc085.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
-
 --!!! From a bug report from Satnam.
 --!!! To do with re-exporting importees from PreludeGla* modules.
 module ShouldSucceed ( module IOExts, module PrelGHC ) where