diff options
28 files changed, 31 insertions, 31 deletions
diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index ba614e7a84..5b72cd0893 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -34,7 +34,7 @@ endif #----------------------------------------------------------------------------- # Setting the GHC compile options -SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude +SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) ifneq "$(way)" "dll" SRC_HC_OPTS += -static endif diff --git a/ghc/lib/std/PrelAddr.lhs b/ghc/lib/std/PrelAddr.lhs index 8a46737c0d..8a0ba32147 100644 --- a/ghc/lib/std/PrelAddr.lhs +++ b/ghc/lib/std/PrelAddr.lhs @@ -5,7 +5,7 @@ \section[PrelAddr]{Module @PrelAddr@} \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelAddr ( Addr(..) diff --git a/ghc/lib/std/PrelArr.lhs b/ghc/lib/std/PrelArr.lhs index e930bad398..6ee1418e8c 100644 --- a/ghc/lib/std/PrelArr.lhs +++ b/ghc/lib/std/PrelArr.lhs @@ -9,7 +9,7 @@ types and operations. For byte-arrays see @PrelByteArr@. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelArr where diff --git a/ghc/lib/std/PrelArrExtra.lhs b/ghc/lib/std/PrelArrExtra.lhs index a7769b88fc..69d8fb12ea 100644 --- a/ghc/lib/std/PrelArrExtra.lhs +++ b/ghc/lib/std/PrelArrExtra.lhs @@ -9,7 +9,7 @@ to compile. So as not to compile the whole of PrelArr with module. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelArrExtra where diff --git a/ghc/lib/std/PrelBase.lhs b/ghc/lib/std/PrelBase.lhs index 4859f4789f..e9160ea9a4 100644 --- a/ghc/lib/std/PrelBase.lhs +++ b/ghc/lib/std/PrelBase.lhs @@ -71,7 +71,7 @@ Other Prelude modules are much easier with fewer complex dependencies. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelBase ( diff --git a/ghc/lib/std/PrelByteArr.lhs b/ghc/lib/std/PrelByteArr.lhs index f2a1b10596..f51ad172a9 100644 --- a/ghc/lib/std/PrelByteArr.lhs +++ b/ghc/lib/std/PrelByteArr.lhs @@ -6,7 +6,7 @@ Byte-arrays are flat arrays of non-pointers only. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelByteArr where diff --git a/ghc/lib/std/PrelConc.lhs b/ghc/lib/std/PrelConc.lhs index 01faf6cc34..f096db1fd2 100644 --- a/ghc/lib/std/PrelConc.lhs +++ b/ghc/lib/std/PrelConc.lhs @@ -7,7 +7,7 @@ Basic concurrency stuff \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelConc ( ThreadId(..) diff --git a/ghc/lib/std/PrelDynamic.lhs b/ghc/lib/std/PrelDynamic.lhs index b90fafe36c..b5939e45ae 100644 --- a/ghc/lib/std/PrelDynamic.lhs +++ b/ghc/lib/std/PrelDynamic.lhs @@ -7,7 +7,7 @@ Dynamic visible here. The rest of the operations on Dynamics are available in exts/Dynamic.lhs. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} #ifndef __HUGS__ module PrelDynamic where diff --git a/ghc/lib/std/PrelEnum.lhs b/ghc/lib/std/PrelEnum.lhs index f4d37eea77..64b599c6bc 100644 --- a/ghc/lib/std/PrelEnum.lhs +++ b/ghc/lib/std/PrelEnum.lhs @@ -6,7 +6,7 @@ Instances of Bounded for various datatypes. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelEnum( Bounded(..), Enum(..), diff --git a/ghc/lib/std/PrelErr.lhs b/ghc/lib/std/PrelErr.lhs index c0269cd3a3..812a369999 100644 --- a/ghc/lib/std/PrelErr.lhs +++ b/ghc/lib/std/PrelErr.lhs @@ -12,7 +12,7 @@ We cannot define these functions in a module where they might be used with what the typechecker figures out. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelErr ( irrefutPatError diff --git a/ghc/lib/std/PrelException.lhs b/ghc/lib/std/PrelException.lhs index a04c66a600..5c63069f89 100644 --- a/ghc/lib/std/PrelException.lhs +++ b/ghc/lib/std/PrelException.lhs @@ -1,5 +1,5 @@ % ----------------------------------------------------------------------------- -% $Id: PrelException.lhs,v 1.16 2000/04/10 13:35:45 simonmar Exp $ +% $Id: PrelException.lhs,v 1.17 2000/04/10 16:02:58 simonpj Exp $ % % (c) The GRAP/AQUA Project, Glasgow University, 1998 % @@ -7,7 +7,7 @@ Exceptions and exception-handling functions. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} #ifndef __HUGS__ module PrelException where diff --git a/ghc/lib/std/PrelFloat.lhs b/ghc/lib/std/PrelFloat.lhs index 250da00527..a1be918f38 100644 --- a/ghc/lib/std/PrelFloat.lhs +++ b/ghc/lib/std/PrelFloat.lhs @@ -16,7 +16,7 @@ and the classes \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} #include "../includes/ieee-flpt.h" diff --git a/ghc/lib/std/PrelForeign.lhs b/ghc/lib/std/PrelForeign.lhs index 859dc18b07..ef4f81551b 100644 --- a/ghc/lib/std/PrelForeign.lhs +++ b/ghc/lib/std/PrelForeign.lhs @@ -5,7 +5,7 @@ \section[Foreign]{Module @Foreign@} \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelForeign ( module PrelForeign, diff --git a/ghc/lib/std/PrelHandle.lhs b/ghc/lib/std/PrelHandle.lhs index a51186e3e9..22ca0d64c9 100644 --- a/ghc/lib/std/PrelHandle.lhs +++ b/ghc/lib/std/PrelHandle.lhs @@ -8,7 +8,7 @@ This module defines Haskell {\em handles} and the basic operations which are supported for them. \begin{code} -{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-} #include "cbits/stgerror.h" #ifndef __HUGS__ /* Hugs just includes this in PreludeBuiltin so no header needed */ diff --git a/ghc/lib/std/PrelIO.lhs b/ghc/lib/std/PrelIO.lhs index 3501b6e154..237b3330f4 100644 --- a/ghc/lib/std/PrelIO.lhs +++ b/ghc/lib/std/PrelIO.lhs @@ -10,7 +10,7 @@ module IO. \begin{code} -{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-} module PrelIO where diff --git a/ghc/lib/std/PrelIOBase.lhs b/ghc/lib/std/PrelIOBase.lhs index 3d4714cf6c..7782c2ac02 100644 --- a/ghc/lib/std/PrelIOBase.lhs +++ b/ghc/lib/std/PrelIOBase.lhs @@ -1,5 +1,5 @@ % ----------------------------------------------------------------------------- -% $Id: PrelIOBase.lhs,v 1.20 2000/04/07 13:45:48 simonpj Exp $ +% $Id: PrelIOBase.lhs,v 1.21 2000/04/10 16:02:58 simonpj Exp $ % % (c) The AQUA Project, Glasgow University, 1994-1998 % @@ -10,7 +10,7 @@ Definitions for the @IO@ monad and its friends. Everything is exported concretely; the @IO@ module itself exports abstractly. \begin{code} -{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-} #include "cbits/stgerror.h" #include "config.h" diff --git a/ghc/lib/std/PrelList.lhs b/ghc/lib/std/PrelList.lhs index 1ea90d6d13..7b85297ee4 100644 --- a/ghc/lib/std/PrelList.lhs +++ b/ghc/lib/std/PrelList.lhs @@ -7,7 +7,7 @@ The List data type and its operations \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelList ( [] (..), diff --git a/ghc/lib/std/PrelMaybe.lhs b/ghc/lib/std/PrelMaybe.lhs index 008a5444e5..16383debc9 100644 --- a/ghc/lib/std/PrelMaybe.lhs +++ b/ghc/lib/std/PrelMaybe.lhs @@ -6,7 +6,7 @@ The @Maybe@ type. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelMaybe where diff --git a/ghc/lib/std/PrelNum.lhs b/ghc/lib/std/PrelNum.lhs index 1ff4c98f28..92ce9ae705 100644 --- a/ghc/lib/std/PrelNum.lhs +++ b/ghc/lib/std/PrelNum.lhs @@ -14,7 +14,7 @@ and the type \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelNum where diff --git a/ghc/lib/std/PrelPack.lhs b/ghc/lib/std/PrelPack.lhs index 934ffa7b4b..6301060d52 100644 --- a/ghc/lib/std/PrelPack.lhs +++ b/ghc/lib/std/PrelPack.lhs @@ -11,7 +11,7 @@ The programmer level view of packed strings is provided by a GHC system library PackedString. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelPack ( diff --git a/ghc/lib/std/PrelRead.lhs b/ghc/lib/std/PrelRead.lhs index 3f648650ed..0b4c1562eb 100644 --- a/ghc/lib/std/PrelRead.lhs +++ b/ghc/lib/std/PrelRead.lhs @@ -7,7 +7,7 @@ Instances of the Read class. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelRead where diff --git a/ghc/lib/std/PrelReal.lhs b/ghc/lib/std/PrelReal.lhs index e6d64d5eed..396b5c8e96 100644 --- a/ghc/lib/std/PrelReal.lhs +++ b/ghc/lib/std/PrelReal.lhs @@ -17,7 +17,7 @@ and the classes \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelReal where diff --git a/ghc/lib/std/PrelST.lhs b/ghc/lib/std/PrelST.lhs index 77e337ae7d..1e2a4738d1 100644 --- a/ghc/lib/std/PrelST.lhs +++ b/ghc/lib/std/PrelST.lhs @@ -4,7 +4,7 @@ \section[PrelST]{The @ST@ monad} \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelST where diff --git a/ghc/lib/std/PrelShow.lhs b/ghc/lib/std/PrelShow.lhs index 44e336482d..837f94f75a 100644 --- a/ghc/lib/std/PrelShow.lhs +++ b/ghc/lib/std/PrelShow.lhs @@ -5,7 +5,7 @@ \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelShow ( diff --git a/ghc/lib/std/PrelStable.lhs b/ghc/lib/std/PrelStable.lhs index faefb0395b..09dc0dc9f4 100644 --- a/ghc/lib/std/PrelStable.lhs +++ b/ghc/lib/std/PrelStable.lhs @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------------- -% $Id: PrelStable.lhs,v 1.3 1999/12/20 10:34:35 simonpj Exp $ +% $Id: PrelStable.lhs,v 1.4 2000/04/10 16:02:58 simonpj Exp $ % % (c) The GHC Team, 1992-1999 % \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelStable ( StablePtr(..) diff --git a/ghc/lib/std/PrelTup.lhs b/ghc/lib/std/PrelTup.lhs index b1f143a394..68e4dc82af 100644 --- a/ghc/lib/std/PrelTup.lhs +++ b/ghc/lib/std/PrelTup.lhs @@ -7,7 +7,7 @@ This modules defines the typle data types. \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelTup where diff --git a/ghc/lib/std/PrelWeak.lhs b/ghc/lib/std/PrelWeak.lhs index c710127f9a..c1d49fbd7a 100644 --- a/ghc/lib/std/PrelWeak.lhs +++ b/ghc/lib/std/PrelWeak.lhs @@ -5,7 +5,7 @@ \section[PrelWeak]{Module @PrelWeak@} \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module PrelWeak where diff --git a/ghc/lib/std/Prelude.lhs b/ghc/lib/std/Prelude.lhs index 7a09c42dc2..01e55fc8e1 100644 --- a/ghc/lib/std/Prelude.lhs +++ b/ghc/lib/std/Prelude.lhs @@ -3,7 +3,7 @@ special names such as () and -> shouldn't be resolved to Prelude.() and Prelude.-> (as they are normally). -- SDM 8/10/97 \begin{code} -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-} module Prelude ( |