From 887e2e2d165f88421a29dc3d09a7ce9b444953b1 Mon Sep 17 00:00:00 2001 From: panne Date: Mon, 12 Jun 2000 16:27:03 +0000 Subject: [PATCH] [project @ 2000-06-12 16:26:59 by panne] * Changed `SRC_HC_OPTS += ...' to `HC_OPTS += ...', otherwise `make SRC_HC_OPTS=foo' does not work. * -syslib => -package --- ghc/tests/ccall/should_compile/Makefile | 6 +----- ghc/tests/ccall/should_fail/Makefile | 2 +- ghc/tests/ccall/should_run/Makefile | 4 ++-- ghc/tests/codeGen/should_run/Makefile | 4 ++-- ghc/tests/concurrent/should_run/Makefile | 4 ++-- ghc/tests/deSugar/should_compile/Makefile | 2 +- ghc/tests/deriving/should_compile/Makefile | 2 +- ghc/tests/deriving/should_fail/Makefile | 2 +- ghc/tests/deriving/should_run/Makefile | 2 +- ghc/tests/io/stable001/Makefile | 2 +- ghc/tests/lib/posix/Makefile | 2 +- ghc/tests/lib/should_run/Makefile | 18 +++++++++--------- ghc/tests/lib/socket/Makefile | 2 +- ghc/tests/printing/should_compile/Makefile | 2 +- ghc/tests/programs/andy_cherry/Makefile | 2 +- ghc/tests/programs/areid_pass/Makefile | 2 +- ghc/tests/programs/callback/Makefile | 2 +- ghc/tests/programs/cvh_unboxing/Makefile | 2 +- ghc/tests/programs/dmgob_native1/Makefile | 4 ++-- ghc/tests/programs/dmgob_native2/Makefile | 2 +- ghc/tests/programs/fast2haskell/Makefile | 2 +- ghc/tests/programs/fexport/Makefile | 2 +- ghc/tests/programs/ipoole_spec_class/Makefile | 2 +- ghc/tests/programs/jeff-bug/Makefile | 2 +- ghc/tests/programs/jon_polycase/Makefile | 2 +- ghc/tests/programs/okeefe_neural/Main.hs | 2 +- ghc/tests/programs/waugh_neural/Makefile | 2 +- ghc/tests/programs/zhang_ccall/Makefile | 2 +- ghc/tests/reader/should_compile/Makefile | 2 +- ghc/tests/reader/should_fail/Makefile | 2 +- ghc/tests/rename/should_compile/Makefile | 2 +- ghc/tests/rename/should_fail/Makefile | 2 +- ghc/tests/simplCore/should_compile/Makefile | 2 +- ghc/tests/stranal/should_compile/Makefile | 2 +- ghc/tests/typecheck/should_compile/Makefile | 6 +++--- ghc/tests/typecheck/should_fail/Makefile | 2 +- ghc/tests/typecheck/should_run/Makefile | 2 +- 37 files changed, 51 insertions(+), 55 deletions(-) diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile index 86a8a9b..01eb5ed 100644 --- a/ghc/tests/ccall/should_compile/Makefile +++ b/ghc/tests/ccall/should_compile/Makefile @@ -2,15 +2,11 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -fglasgow-exts +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... -cc001_HC_OPTS = -noC -cc002_HC_OPTS = -noC -cc003_HC_OPTS = -noC -cc004_HC_OPTS = -noC cc005_HC_OPTS = -fvia-C cc006_HC_OPTS = -fvia-C -fno-prune-tydecls diff --git a/ghc/tests/ccall/should_fail/Makefile b/ghc/tests/ccall/should_fail/Makefile index 108ff21..0bcc375 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 -SRC_HC_OPTS += -noC -fglasgow-exts +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 c16cbc2..fb5810e 100644 --- a/ghc/tests/ccall/should_run/Makefile +++ b/ghc/tests/ccall/should_run/Makefile @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.3 2000/05/15 14:29:04 simonmar Exp $ +# $Id: Makefile,v 1.4 2000/06/12 16:26:59 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -SRC_HC_OPTS += -dcore-lint -fglasgow-exts +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 a745b80..a6033b4 100644 --- a/ghc/tests/codeGen/should_run/Makefile +++ b/ghc/tests/codeGen/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.10 2000/05/10 14:33:41 rrt Exp $ +# $Id: Makefile,v 1.11 2000/06/12 16:26:59 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk @@ -10,7 +10,7 @@ endif include $(TOP)/mk/should_run.mk -SRC_HC_OPTS += -dcore-lint +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 40c9db0..3fd12b9 100644 --- a/ghc/tests/concurrent/should_run/Makefile +++ b/ghc/tests/concurrent/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.6 2000/05/10 14:30:59 rrt Exp $ +# $Id: Makefile,v 1.7 2000/06/12 16:27:00 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 -SRC_HC_OPTS += -dcore-lint -syslib concurrent -fglasgow-exts +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 0bd45f5..fe9631f 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 -SRC_HC_OPTS += -noC -dcore-lint +HC_OPTS += -noC -dcore-lint ds035_HC_OPTS = -fglasgow-exts ds044_HC_OPTS = -O -funbox-strict-fields diff --git a/ghc/tests/deriving/should_compile/Makefile b/ghc/tests/deriving/should_compile/Makefile index fe63d60..b4e9581 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 -SRC_HC_OPTS += -noC -dcore-lint -nohi +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 814df45..5d88d1e 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 -SRC_HC_OPTS += -noC +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 d39565d..373a249 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 -SRC_HC_OPTS += -dcore-lint +HC_OPTS += -dcore-lint drvrun005_RUNTEST_OPTS += -fail diff --git a/ghc/tests/io/stable001/Makefile b/ghc/tests/io/stable001/Makefile index 0f67c21..d2b543e 100644 --- a/ghc/tests/io/stable001/Makefile +++ b/ghc/tests/io/stable001/Makefile @@ -1,6 +1,6 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts include $(TOP)/mk/should_run.mk HC_OPTS += -dcore-lint diff --git a/ghc/tests/lib/posix/Makefile b/ghc/tests/lib/posix/Makefile index 0e80d2b..bd1befe 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 -syslib posix -fglasgow-exts +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 09d630e..d082635 100644 --- a/ghc/tests/lib/should_run/Makefile +++ b/ghc/tests/lib/should_run/Makefile @@ -1,27 +1,27 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.20 2000/05/16 11:36:57 rrt Exp $ +# $Id: Makefile,v 1.21 2000/06/12 16:27:00 panne Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -SRC_HC_OPTS += -dcore-lint +HC_OPTS += -dcore-lint -packedstring001_HC_OPTS = -syslib lang +packedstring001_HC_OPTS = -package lang exceptions001_HC_OPTS = -fglasgow-exts -fno-warn-missing-methods stableptr001_HC_OPTS = -fglasgow-exts stableptr002_HC_OPTS = -fglasgow-exts stableptr003_HC_OPTS = -fglasgow-exts list001_HC_OPTS = -fglasgow-exts -uri001_HC_OPTS = -syslib lang -syslib net -time001_HC_OPTS = -syslib lang +uri001_HC_OPTS = -package lang -package net +time001_HC_OPTS = -package lang enum01_HC_OPTS = -cpp -fglasgow-exts -H12m enum02_HC_OPTS = -cpp -fglasgow-exts -H12m enum03_HC_OPTS = -cpp -fglasgow-exts -H12m stableptr001_RUNTEST_OPTS = +RTS -K4m -dynamic001_HC_OPTS = -syslib lang +dynamic001_HC_OPTS = -package lang io001_HC_OPTS = -fglasgow-exts io002_HC_OPTS = -fglasgow-exts @@ -30,17 +30,17 @@ addr001_HC_OPTS = -fglasgow-exts ioexts001_HC_OPTS = -fglasgow-exts -O ioexts001_RUNTEST_OPTS = +RTS -K8m -memo001_HC_OPTS = -syslib lang -syslib util +memo001_HC_OPTS = -package lang -package util # stress the garbage collector a bit, to make sure weak pointers are being # finalized properly, and stable names are GC'd etc. memo001_RUNTEST_OPTS = +RTS -A10k -G1 -memo002_HC_OPTS = -syslib lang -syslib util +memo002_HC_OPTS = -package lang -package util memo002_RUNTEST_OPTS = 20 weak001_HC_OPTS = -fglasgow-exts -SRC_MKDEPENDHS_OPTS += -syslib lang +SRC_MKDEPENDHS_OPTS += -package lang include $(TOP)/mk/target.mk diff --git a/ghc/tests/lib/socket/Makefile b/ghc/tests/lib/socket/Makefile index 3bb09f6..827d9fb 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 -syslib posix -fglasgow-exts +HC_OPTS += -dcore-lint -package posix -fglasgow-exts .PRECIOUS: %.o %.bin diff --git a/ghc/tests/printing/should_compile/Makefile b/ghc/tests/printing/should_compile/Makefile index c4140f2..7c72321 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 -SRC_HC_OPTS += -noC -dcore-lint -hi-with-declarations -hi-with-exports -hi-with-instances -hi-with-fixities -ddump-tc +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 2ac9f14..0462430 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 -SRC_HC_OPTS += -cpp +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 c85f52d..21a9c6d 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 -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/callback/Makefile b/ghc/tests/programs/callback/Makefile index 8eb5c96..a765b52 100644 --- a/ghc/tests/programs/callback/Makefile +++ b/ghc/tests/programs/callback/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts CC = $(HC) diff --git a/ghc/tests/programs/cvh_unboxing/Makefile b/ghc/tests/programs/cvh_unboxing/Makefile index c85f52d..21a9c6d 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 -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/dmgob_native1/Makefile b/ghc/tests/programs/dmgob_native1/Makefile index 1df0177..dbf705c 100644 --- a/ghc/tests/programs/dmgob_native1/Makefile +++ b/ghc/tests/programs/dmgob_native1/Makefile @@ -2,8 +2,8 @@ TOP = .. include $(TOP)/mk/boilerplate.mk SRC_RUNTEST_OPTS += test_data -SRC_HC_OPTS += -cpp -syslib misc -EXTRA_LD_OPTS += -syslib misc +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 39e1e2c..b75c113 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 -SRC_HC_OPTS += -cpp -syslib misc -syslib exts +HC_OPTS += -cpp -package misc -package exts all :: runtest diff --git a/ghc/tests/programs/fast2haskell/Makefile b/ghc/tests/programs/fast2haskell/Makefile index c85f52d..21a9c6d 100644 --- a/ghc/tests/programs/fast2haskell/Makefile +++ b/ghc/tests/programs/fast2haskell/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/programs/fexport/Makefile b/ghc/tests/programs/fexport/Makefile index d1dd144..0b115b2 100644 --- a/ghc/tests/programs/fexport/Makefile +++ b/ghc/tests/programs/fexport/Makefile @@ -1,7 +1,7 @@ TOP = .. include $(TOP)/mk/boilerplate.mk -SRC_HC_OPTS += -fglasgow-exts -no-hs-main +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 fa26d65..5f34689 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 -SRC_HC_OPTS += -cpp +HC_OPTS += -cpp all :: runtest diff --git a/ghc/tests/programs/jeff-bug/Makefile b/ghc/tests/programs/jeff-bug/Makefile index 9f76a7e..6c9cea3 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 -SRC_HC_OPTS += -fglasgow-exts -cpp -optP-imacros -optPhawk-macros.h +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 7e5f406..130ed6f 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 -SRC_HC_OPTS += -Onot +HC_OPTS += -Onot # Just compiling Foo successfully is OK all :: Foo.o diff --git a/ghc/tests/programs/okeefe_neural/Main.hs b/ghc/tests/programs/okeefe_neural/Main.hs index 2172c53..bb28545 100644 --- a/ghc/tests/programs/okeefe_neural/Main.hs +++ b/ghc/tests/programs/okeefe_neural/Main.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -syslib lang #-} +{-# OPTIONS -package lang #-} module Main(main) where diff --git a/ghc/tests/programs/waugh_neural/Makefile b/ghc/tests/programs/waugh_neural/Makefile index 90d2c21..36be1e7 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 -SRC_HC_OPTS += -syslib lang +HC_OPTS += -package lang all :: runtest diff --git a/ghc/tests/programs/zhang_ccall/Makefile b/ghc/tests/programs/zhang_ccall/Makefile index c85f52d..21a9c6d 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 -SRC_HC_OPTS += -fglasgow-exts +HC_OPTS += -fglasgow-exts all :: runtest diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile index c1b1008..a42b874 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 -SRC_HC_OPTS += -noC -dcore-lint +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 389a4ca..75e15c3 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 -SRC_HC_OPTS += -noC -ddump-parsed +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 45b95af..35aac07 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 -SRC_HC_OPTS += -dcore-lint +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 814df45..5d88d1e 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 -SRC_HC_OPTS += -noC +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 876f9b6..226253a 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 -SRC_HC_OPTS += -dcore-lint +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 8707162..ad50aea 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 -SRC_HC_OPTS += -noC -O -dcore-lint +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 f5e422d..2381fc2 100644 --- a/ghc/tests/typecheck/should_compile/Makefile +++ b/ghc/tests/typecheck/should_compile/Makefile @@ -2,12 +2,12 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports +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 lang -syslib data +tc065_HC_OPTS = -package lang -package data tc087_HC_OPTS = -fglasgow-exts -tc088_HC_OPTS = -syslib lang +tc088_HC_OPTS = -package lang tc089_HC_OPTS = -H12m tc097_HC_OPTS = -fglasgow-exts tc100_HC_OPTS = -O diff --git a/ghc/tests/typecheck/should_fail/Makefile b/ghc/tests/typecheck/should_fail/Makefile index f61c7c3..8bb190a 100644 --- a/ghc/tests/typecheck/should_fail/Makefile +++ b/ghc/tests/typecheck/should_fail/Makefile @@ -5,7 +5,7 @@ include $(TOP)/mk/should_fail.mk HS_SRCS = $(wildcard *.hs) # The -noC messes up the Data82 compilation -# SRC_HC_OPTS += -noC +# 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 2e11fb0..72dfd78 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 -SRC_HC_OPTS += -dcore-lint +HC_OPTS += -dcore-lint tcrun003_HC_OPTS += -fglasgow-exts tcrun004_HC_OPTS += -fglasgow-exts -- 1.7.10.4