From: panne Date: Mon, 12 Jun 2000 17:02:00 +0000 (+0000) Subject: [project @ 2000-06-12 17:01:56 by panne] X-Git-Tag: Approximately_9120_patches~4275 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=9a90b1feceb2fb6b8234083ce3bf78fc124ea44b [project @ 2000-06-12 17:01:56 by panne] HC_OPTS => SRC_HC_OPTS again, sorry about that --- diff --git a/ghc/tests/array/should_run/Makefile b/ghc/tests/array/should_run/Makefile index 4e110b9..08c5852 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 01eb5ed..7c553f5 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 0bcc375..108ff21 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 fb5810e..72bc938 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 a6033b4..7c5153e 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 3fd12b9..b17dea1 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 fe9631f..0bd45f5 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 ddb826f..15977de 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 b4e9581..fe63d60 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 5d88d1e..814df45 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 373a249..d39565d 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 61f30d7..86ffcf7 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 d2b543e..4f04e7f 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 bd1befe..044235b 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 d082635..3b3e822 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 827d9fb..20bb4f6 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 1538736..cb30478 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 7c72321..c4140f2 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 0462430..2ac9f14 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 21a9c6d..c85f52d 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 a765b52..8eb5c96 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 21a9c6d..c85f52d 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 dbf705c..20d271f 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 b75c113..e8ddc6f 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 21a9c6d..c85f52d 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 0b115b2..d1dd144 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 5f34689..fa26d65 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 6c9cea3..9f76a7e 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 130ed6f..7e5f406 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 36be1e7..89ba1f9 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 21a9c6d..c85f52d 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 a42b874..c1b1008 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 75e15c3..389a4ca 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 35aac07..45b95af 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 5d88d1e..814df45 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 226253a..876f9b6 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 ad50aea..8707162 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 2381fc2..bf34049 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 72dfd78..2e11fb0 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