[project @ 1998-05-06 15:10:40 by simonm]

use SRC_HC_OPTS, not HC_OPTS.

diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile
index f1cb1fa..86a8a9b 100644 (file)
--- a/ghc/tests/ccall/should_compile/Makefile
+++ b/ghc/tests/ccall/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint -fglasgow-exts
+SRC_HC_OPTS += -noC -dcore-lint -fglasgow-exts
 
 # Note that these tests are still in a state of flux... don't believe errors
 # they report. In fact, these aren't really very good tests at all...

diff --git a/ghc/tests/ccall/should_fail/Makefile b/ghc/tests/ccall/should_fail/Makefile
index 0bcc375..108ff21 100644 (file)
--- a/ghc/tests/ccall/should_fail/Makefile
+++ b/ghc/tests/ccall/should_fail/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_fail.mk
 
-HC_OPTS += -noC -fglasgow-exts
+SRC_HC_OPTS += -noC -fglasgow-exts
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile
index cc33000..2d75c34 100644 (file)
--- a/ghc/tests/codeGen/should_run/Makefile
+++ b/ghc/tests/codeGen/should_run/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_run.mk
 
-HC_OPTS += -dcore-lint
+SRC_HC_OPTS += -dcore-lint
 
 cg012_HC_OPTS = -fglasgow-exts
 cg015_HC_OPTS = -fglasgow-exts

diff --git a/ghc/tests/deSugar/should_compile/Makefile b/ghc/tests/deSugar/should_compile/Makefile
index 3785873..735b987 100644 (file)
--- a/ghc/tests/deSugar/should_compile/Makefile
+++ b/ghc/tests/deSugar/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint
+SRC_HC_OPTS += -noC -dcore-lint
 
 ds035_HC_OPTS = -fglasgow-exts
 

diff --git a/ghc/tests/deriving/should_compile/Makefile b/ghc/tests/deriving/should_compile/Makefile
index b4e9581..fe63d60 100644 (file)
--- 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
 
-HC_OPTS += -noC -dcore-lint -nohi
+SRC_HC_OPTS += -noC -dcore-lint -nohi
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/deriving/should_fail/Makefile b/ghc/tests/deriving/should_fail/Makefile
index 5d88d1e..814df45 100644 (file)
--- a/ghc/tests/deriving/should_fail/Makefile
+++ b/ghc/tests/deriving/should_fail/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_fail.mk
 
-HC_OPTS += -noC
+SRC_HC_OPTS += -noC
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/deriving/should_run/Makefile b/ghc/tests/deriving/should_run/Makefile
index 7ed54bb..9142864 100644 (file)
--- a/ghc/tests/deriving/should_run/Makefile
+++ b/ghc/tests/deriving/should_run/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_run.mk
 
-HC_OPTS += -dcore-lint
+SRC_HC_OPTS += -dcore-lint
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/printing/should_compile/Makefile b/ghc/tests/printing/should_compile/Makefile
index 7c72321..c4140f2 100644 (file)
--- a/ghc/tests/printing/should_compile/Makefile
+++ b/ghc/tests/printing/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint -hi-with-declarations -hi-with-exports -hi-with-instances -hi-with-fixities -ddump-tc
+SRC_HC_OPTS += -noC -dcore-lint -hi-with-declarations -hi-with-exports -hi-with-instances -hi-with-fixities -ddump-tc
 
 print002_HC_OPTS = -fno-implicit-prelude
 

diff --git a/ghc/tests/reader/should_fail/Makefile b/ghc/tests/reader/should_fail/Makefile
index 73fc3ff..56488c6 100644 (file)
--- a/ghc/tests/reader/should_fail/Makefile
+++ b/ghc/tests/reader/should_fail/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_fail.mk
 
-HC_OPTS += -noC -ddump-rdr
+SRC_HC_OPTS += -noC -ddump-rdr
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/rename/should_compile/Makefile b/ghc/tests/rename/should_compile/Makefile
index 212553c..2596f4d 100644 (file)
--- a/ghc/tests/rename/should_compile/Makefile
+++ b/ghc/tests/rename/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint
+SRC_HC_OPTS += -noC -dcore-lint
 
 rn017_HC_OPTS = -hi
 

diff --git a/ghc/tests/rename/should_fail/Makefile b/ghc/tests/rename/should_fail/Makefile
index 5d88d1e..814df45 100644 (file)
--- a/ghc/tests/rename/should_fail/Makefile
+++ b/ghc/tests/rename/should_fail/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_fail.mk
 
-HC_OPTS += -noC
+SRC_HC_OPTS += -noC
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/simplCore/should_compile/Makefile b/ghc/tests/simplCore/should_compile/Makefile
index 30aedc2..75a14b9 100644 (file)
--- a/ghc/tests/simplCore/should_compile/Makefile
+++ b/ghc/tests/simplCore/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint
+SRC_HC_OPTS += -noC -dcore-lint
 
 include $(TOP)/mk/target.mk
 

diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile
index c35a8f8..f508ab2 100644 (file)
--- a/ghc/tests/typecheck/should_compile/Makefile
+++ b/ghc/tests/typecheck/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports
+SRC_HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports
 
 tc019_HC_OPTS = -fglasgow-exts
 tc065_HC_OPTS = -syslib misc

diff --git a/ghc/tests/typecheck/should_fail/Makefile b/ghc/tests/typecheck/should_fail/Makefile
index 37b8b8e..1f649ea 100644 (file)
--- a/ghc/tests/typecheck/should_fail/Makefile
+++ b/ghc/tests/typecheck/should_fail/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_fail.mk
 
-HC_OPTS += -noC
+SRC_HC_OPTS += -noC
 
 tcfail045_HC_OPTS = -fglasgow-exts
 tcfail068_HC_OPTS = -fglasgow-exts

diff --git a/ghc/tests/typecheck/should_run/Makefile b/ghc/tests/typecheck/should_run/Makefile
index 7ed54bb..9142864 100644 (file)
--- a/ghc/tests/typecheck/should_run/Makefile
+++ b/ghc/tests/typecheck/should_run/Makefile
@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_run.mk
 
-HC_OPTS += -dcore-lint
+SRC_HC_OPTS += -dcore-lint
 
 include $(TOP)/mk/target.mk