diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile index f1cb1fa25c51702d4c798d9540e92166fc0927f0..86a8a9bdc807627afe3d414951af0b4efe1163bd 100644 --- 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 0bcc375826ec7815d9f1e5e6cdbf8eefd879b755..108ff21cffd1e3896ece3d850adf487e558652ac 100644 --- 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 cc330007d4699f985419460cd85b19110c225cda..2d75c344f6a498c517c1fcea4619c984440822e6 100644 --- 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 378587359697a5f2f0978017a1677ab1a9c1cf5e..735b987de5cc0215f1d5eadbe70cd8cd31d6b012 100644 --- 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 b4e958146cbe56c59bee44a8e0bc07a2b34bdfae..fe63d607607d9cf7f527dc3fd7d2b3881763c164 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 -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 5d88d1e1ed1ca958f63b85033ec15aa91784575d..814df45b4e30b4209fcfb3dadca2423cf0314b1f 100644 --- 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 7ed54bbe51f2ad5f74253cb219d389ad5861dd90..91428646c86acc7194b4ef390758cb9b6e4f9be9 100644 --- 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 7c7232180cc3a8d104c6f5c9347a7e827cd17bb1..c4140f28ae887bebdd95fa6e098ac7525057e761 100644 --- 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 73fc3ffc70b0dc2c34238ac2b9b9251e4ef52074..56488c6ce72aa23932f9e71d68fd9c4eb245a11f 100644 --- 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 212553c7cdc3024fd4e879fcf9e91087796760f4..2596f4de68142defab802e7ac9a5bded47b55817 100644 --- 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 5d88d1e1ed1ca958f63b85033ec15aa91784575d..814df45b4e30b4209fcfb3dadca2423cf0314b1f 100644 --- 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 30aedc251b034e73f991141633f336cb02dc9e05..75a14b9e00363d2755a3510e69752e73312f6306 100644 --- 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 c35a8f84312e7ebf3c4d4b63f3e5eac850452927..f508ab20facd3a0e8b6adfb3a131546228ba3a5c 100644 --- 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 37b8b8eacfa0ca01209a085de41305cad7058eac..1f649eaa7d50d04ee6e97a046f22ab54e105c851 100644 --- 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 7ed54bbe51f2ad5f74253cb219d389ad5861dd90..91428646c86acc7194b4ef390758cb9b6e4f9be9 100644 --- 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