diff --git a/ghc/tests/array/should_run/Makefile b/ghc/tests/array/should_run/Makefile index 4e110b95a3f26dcb7cdaf132f084b1028a292a64..08c585244769a43ae1669ad1e84c139a43cd27b2 100644 --- a/ghc/tests/array/should_run/Makefile +++ b/ghc/tests/array/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 arr014_HC_OPTS = -fglasgow-exts diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile index 01eb5ed950210a77e481d98931ea77984f1e5e6d..7c553f50c72375d4a291f9c25f8eff224dcc69aa 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/ccall/should_run/Makefile b/ghc/tests/ccall/should_run/Makefile index fb5810e0f2fde54713a71d0e8ca61c0b846e7d94..72bc938a0271c2d2bd26444c14e8ea7c5fa5ea2c 100644 --- a/ghc/tests/ccall/should_run/Makefile +++ b/ghc/tests/ccall/should_run/Makefile @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.4 2000/06/12 16:26:59 panne Exp $ +# $Id: Makefile,v 1.5 2000/06/12 17:01:57 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -fglasgow-exts callback_HC_OPTS += -fvia-C diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile index a6033b4740ad0161e26269dd96e909df6f1888c8..7c5153efb57d7643f63c95510c2c96e0b9bca0c4 100644 --- a/ghc/tests/codeGen/should_run/Makefile +++ b/ghc/tests/codeGen/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.11 2000/06/12 16:26:59 panne Exp $ +# $Id: Makefile,v 1.12 2000/06/12 17:01:57 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk @@ -10,7 +10,7 @@ endif 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/concurrent/should_run/Makefile b/ghc/tests/concurrent/should_run/Makefile index 3fd12b9bd65647cf97768bf8a2f9cdd83e9b15f5..b17dea19ec406b3c7c1f3422be064b75b9da0388 100644 --- a/ghc/tests/concurrent/should_run/Makefile +++ b/ghc/tests/concurrent/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.7 2000/06/12 16:27:00 panne Exp $ +# $Id: Makefile,v 1.8 2000/06/12 17:01:57 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk @@ -14,6 +14,6 @@ include $(TOP)/mk/should_run.mk conc009_RUNTEST_OPTS = -x 1 conc021_RUNTEST_OPTS = -x 250 -HC_OPTS += -dcore-lint -package concurrent -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -package concurrent -fglasgow-exts include $(TOP)/mk/target.mk diff --git a/ghc/tests/deSugar/should_compile/Makefile b/ghc/tests/deSugar/should_compile/Makefile index fe9631f05a1dab839975125f31f4ba83aa1aabfc..0bd45f5dcf68bbaf28653eed68e4fba4311f05bb 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 ds044_HC_OPTS = -O -funbox-strict-fields diff --git a/ghc/tests/deSugar/should_run/Makefile b/ghc/tests/deSugar/should_run/Makefile index ddb826f2534cccb6d080703122ddc7e278d3f1fe..15977de447bc635d6a5a6b2824f6acabff4ca7be 100644 --- a/ghc/tests/deSugar/should_run/Makefile +++ b/ghc/tests/deSugar/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 dsrun005_RUNTEST_OPTS = -x 1 dsrun007_RUNTEST_OPTS = -x 1 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 373a249bc7bd19b72931af2b7911e21ab93091b4..d39565dce6b24221c475a8ad882f020eca0f0077 100644 --- a/ghc/tests/deriving/should_run/Makefile +++ b/ghc/tests/deriving/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 drvrun005_RUNTEST_OPTS += -fail diff --git a/ghc/tests/io/should_run/Makefile b/ghc/tests/io/should_run/Makefile index 61f30d705d45f04e83c618ef4aaeaa7136f8e9d4..86ffcf7863bb7cf3c55c5c723a81fa5c6cc7bfcf 100644 --- a/ghc/tests/io/should_run/Makefile +++ b/ghc/tests/io/should_run/Makefile @@ -9,7 +9,7 @@ endif include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint +SRC_HC_OPTS += -dcore-lint io022_HC_OPTS += -fglasgow-exts io010_HC_OPTS += -fglasgow-exts io011_HC_OPTS += -fglasgow-exts diff --git a/ghc/tests/io/stable001/Makefile b/ghc/tests/io/stable001/Makefile index d2b543e620823a9656c22e841038f6231a6e5fe4..4f04e7f5e3c737ea8df742929251381eb1ea575e 100644 --- a/ghc/tests/io/stable001/Makefile +++ b/ghc/tests/io/stable001/Makefile @@ -1,9 +1,9 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint +SRC_HC_OPTS += -dcore-lint .PRECIOUS: %.o %.bin include $(TOP)/mk/target.mk diff --git a/ghc/tests/lib/posix/Makefile b/ghc/tests/lib/posix/Makefile index bd1befef188089bc93e999229e78531ecc310702..044235b33a0b1eea3bb38fddfb2583a5adb97e0f 100644 --- a/ghc/tests/lib/posix/Makefile +++ b/ghc/tests/lib/posix/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint -package posix -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -package posix -fglasgow-exts # Posix007 is interactive, you'll have to issue a ^C on your tty. posix007_RUNTEST_OPTS += -i/dev/tty diff --git a/ghc/tests/lib/should_run/Makefile b/ghc/tests/lib/should_run/Makefile index d082635c136f4a28bf62c43963ec7ff78ffa6bd3..3b3e8222ac5be5e9b0007eac0c1aa2ec39d7c912 100644 --- a/ghc/tests/lib/should_run/Makefile +++ b/ghc/tests/lib/should_run/Makefile @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.21 2000/06/12 16:27:00 panne Exp $ +# $Id: Makefile,v 1.22 2000/06/12 17:01:58 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint +SRC_HC_OPTS += -dcore-lint packedstring001_HC_OPTS = -package lang exceptions001_HC_OPTS = -fglasgow-exts -fno-warn-missing-methods diff --git a/ghc/tests/lib/socket/Makefile b/ghc/tests/lib/socket/Makefile index 827d9fbfa0c210e1481c7d25bce5483d1cb5e508..20bb4f690707cd0eb99dd5b8f9b095adcdba519b 100644 --- a/ghc/tests/lib/socket/Makefile +++ b/ghc/tests/lib/socket/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint -package posix -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -package posix -fglasgow-exts .PRECIOUS: %.o %.bin diff --git a/ghc/tests/numeric/should_run/Makefile b/ghc/tests/numeric/should_run/Makefile index 1538736a660ea686c3d1f11843644d8281468709..cb304782345ba5d9a0ebfb02f941dc8e747f8895 100644 --- a/ghc/tests/numeric/should_run/Makefile +++ b/ghc/tests/numeric/should_run/Makefile @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.6 1999/11/01 16:07:50 simonpj Exp $ +# $Id: Makefile,v 1.7 2000/06/12 17:01:58 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -HC_OPTS += -dcore-lint +SRC_HC_OPTS += -dcore-lint arith006_HC_OPTS += -fglasgow-exts arith010_HC_OPTS += -fglasgow-exts arith011_HC_OPTS += -fglasgow-exts 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/programs/andy_cherry/Makefile b/ghc/tests/programs/andy_cherry/Makefile index 04624301a60791a4f14b7376f3ac92c6aad40eec..2ac9f1490cba9af0091e0e438e4dc4cc9d2f0511 100644 --- a/ghc/tests/programs/andy_cherry/Makefile +++ b/ghc/tests/programs/andy_cherry/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -cpp +SRC_HC_OPTS += -cpp SRC_RUNTEST_OPTS += -d tex mygames.pgn all :: runtest diff --git a/ghc/tests/programs/areid_pass/Makefile b/ghc/tests/programs/areid_pass/Makefile index 21a9c6dcf4d51747f0d2e717dd018207704ab4f4..c85f52d136cc7b15ddc24b0e728cca336252d015 100644 --- a/ghc/tests/programs/areid_pass/Makefile +++ b/ghc/tests/programs/areid_pass/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/callback/Makefile b/ghc/tests/programs/callback/Makefile index a765b528e66e10541bc1cfe9b8af0c470ec044c5..8eb5c96256ea2c5d92f1867c4d0f229543ed73d7 100644 --- a/ghc/tests/programs/callback/Makefile +++ b/ghc/tests/programs/callback/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts CC = $(HC) diff --git a/ghc/tests/programs/cvh_unboxing/Makefile b/ghc/tests/programs/cvh_unboxing/Makefile index 21a9c6dcf4d51747f0d2e717dd018207704ab4f4..c85f52d136cc7b15ddc24b0e728cca336252d015 100644 --- a/ghc/tests/programs/cvh_unboxing/Makefile +++ b/ghc/tests/programs/cvh_unboxing/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/dmgob_native1/Makefile b/ghc/tests/programs/dmgob_native1/Makefile index dbf705c698f664e0a2eb26308b792610b9541b96..20d271f5466c34fe8178366a3ccb90d539e8cb07 100644 --- a/ghc/tests/programs/dmgob_native1/Makefile +++ b/ghc/tests/programs/dmgob_native1/Makefile @@ -2,7 +2,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk SRC_RUNTEST_OPTS += test_data -HC_OPTS += -cpp -package misc +SRC_HC_OPTS += -cpp -package misc EXTRA_LD_OPTS += -package misc OBJS = $(HS_OBJS) diff --git a/ghc/tests/programs/dmgob_native2/Makefile b/ghc/tests/programs/dmgob_native2/Makefile index b75c113ad5b8646bfab77e336dfbf031d3ff9f49..e8ddc6f49a421c07f4b7612485fb00828522499a 100644 --- a/ghc/tests/programs/dmgob_native2/Makefile +++ b/ghc/tests/programs/dmgob_native2/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -cpp -package misc -package exts +SRC_HC_OPTS += -cpp -package misc -package exts all :: runtest diff --git a/ghc/tests/programs/fast2haskell/Makefile b/ghc/tests/programs/fast2haskell/Makefile index 21a9c6dcf4d51747f0d2e717dd018207704ab4f4..c85f52d136cc7b15ddc24b0e728cca336252d015 100644 --- a/ghc/tests/programs/fast2haskell/Makefile +++ b/ghc/tests/programs/fast2haskell/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/fexport/Makefile b/ghc/tests/programs/fexport/Makefile index 0b115b2cde250dbac7e163f138a25de45e26ad36..d1dd14442d717a48593ed67d21415d94c200ace2 100644 --- a/ghc/tests/programs/fexport/Makefile +++ b/ghc/tests/programs/fexport/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts -no-hs-main +SRC_HC_OPTS += -fglasgow-exts -no-hs-main CC = $(HC) diff --git a/ghc/tests/programs/ipoole_spec_class/Makefile b/ghc/tests/programs/ipoole_spec_class/Makefile index 5f346898f32ee9175ae85e19b9808e7622578d99..fa26d6562d3f8e4c5aa6db7948bfa9d24f9699d2 100644 --- a/ghc/tests/programs/ipoole_spec_class/Makefile +++ b/ghc/tests/programs/ipoole_spec_class/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -cpp +SRC_HC_OPTS += -cpp all :: runtest diff --git a/ghc/tests/programs/jeff-bug/Makefile b/ghc/tests/programs/jeff-bug/Makefile index 6c9cea3eb06ed35c8f618e534e4ff5c7377176ed..9f76a7e8d803a1f68518ea715a8bfdda390191ab 100644 --- a/ghc/tests/programs/jeff-bug/Makefile +++ b/ghc/tests/programs/jeff-bug/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts -cpp -optP-imacros -optPhawk-macros.h +SRC_HC_OPTS += -fglasgow-exts -cpp -optP-imacros -optPhawk-macros.h # Lack sensible input file to test it with. SRC_RUNTEST_OPTS += -count /dev/null diff --git a/ghc/tests/programs/jon_polycase/Makefile b/ghc/tests/programs/jon_polycase/Makefile index 130ed6f51cafe8a240cc24da787a7f41bbcc72d9..7e5f40638faec799c442d303c28e22f9c36e2b05 100644 --- a/ghc/tests/programs/jon_polycase/Makefile +++ b/ghc/tests/programs/jon_polycase/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk # The bug was delicate: only happens without -O -HC_OPTS += -Onot +SRC_HC_OPTS += -Onot # Just compiling Foo successfully is OK all :: Foo.o diff --git a/ghc/tests/programs/waugh_neural/Makefile b/ghc/tests/programs/waugh_neural/Makefile index 36be1e77090f25219e3edaf50a585dad08b484bd..89ba1f92ee95353b572d40cfc61e143f61b10b1e 100644 --- a/ghc/tests/programs/waugh_neural/Makefile +++ b/ghc/tests/programs/waugh_neural/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -package lang +SRC_HC_OPTS += -package lang all :: runtest diff --git a/ghc/tests/programs/zhang_ccall/Makefile b/ghc/tests/programs/zhang_ccall/Makefile index 21a9c6dcf4d51747f0d2e717dd018207704ab4f4..c85f52d136cc7b15ddc24b0e728cca336252d015 100644 --- a/ghc/tests/programs/zhang_ccall/Makefile +++ b/ghc/tests/programs/zhang_ccall/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile index a42b874ecc3d6498aade83bc61dcbbcd9ebe9f48..c1b1008769f814d039a64dbfee0017b4359aeae9 100644 --- a/ghc/tests/reader/should_compile/Makefile +++ b/ghc/tests/reader/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 read012_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts -ohi T1.hi read013_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts diff --git a/ghc/tests/reader/should_fail/Makefile b/ghc/tests/reader/should_fail/Makefile index 75e15c390d790b93926e88a8b52d8d24b6e9976e..389a4ca73e5405ea583d06d75621a0a019860d0a 100644 --- a/ghc/tests/reader/should_fail/Makefile +++ b/ghc/tests/reader/should_fail/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -HC_OPTS += -noC -ddump-parsed +SRC_HC_OPTS += -noC -ddump-parsed read013_HC_OPTS += -fglasgow-exts diff --git a/ghc/tests/rename/should_compile/Makefile b/ghc/tests/rename/should_compile/Makefile index 35aac07d9859eeac157dcb9c027d1839b41de13f..45b95af16fd79be3df1986535cff413c209c9a7e 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 += -dcore-lint +SRC_HC_OPTS += -dcore-lint # There used to be a -noC flag, but I removed it because # Rn037Help needs to generate an interface file, and # if -noC is on I can't see how to. (Driver grottiness.) 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 226253af24dbaf8bbfa728e854611d6fdb679fea..876f9b6107304286b2660b3d6917e6ea3cc32446 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 += -dcore-lint +SRC_HC_OPTS += -dcore-lint simpl006_HC_OPTS += -package concurrent diff --git a/ghc/tests/stranal/should_compile/Makefile b/ghc/tests/stranal/should_compile/Makefile index ad50aea300fb5ed64a5956f0abf7469fa0b69e84..8707162b8e86b260477fe56459487fab2ae8ff82 100644 --- a/ghc/tests/stranal/should_compile/Makefile +++ b/ghc/tests/stranal/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -HC_OPTS += -noC -O -dcore-lint +SRC_HC_OPTS += -noC -O -dcore-lint str001_HC_OPTS = -hi-with-decls -hi-with-exports -hi-with-instances diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile index 2381fc2797713465601b722681a0acf9d1c2db19..bf34049977cef8fc19afd3c32c10043379a217b6 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 = -package lang -package data diff --git a/ghc/tests/typecheck/should_run/Makefile b/ghc/tests/typecheck/should_run/Makefile index 72dfd78697e298f9eea1a27253baf73eadf0a393..2e11fb05b0c8130a7e70ba51d5faed5299e17bc5 100644 --- a/ghc/tests/typecheck/should_run/Makefile +++ b/ghc/tests/typecheck/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 tcrun003_HC_OPTS += -fglasgow-exts tcrun004_HC_OPTS += -fglasgow-exts