[project @ 1999-03-02 19:01:56 by sof]

Remove out-of-date use of -fcompiling-prelude

diff --git a/ghc/compiler/basicTypes/Module.lhs b/ghc/compiler/basicTypes/Module.lhs
index 27d2cf2..deeefe1 100644 (file)
--- a/ghc/compiler/basicTypes/Module.lhs
+++ b/ghc/compiler/basicTypes/Module.lhs
@@ -44,7 +44,7 @@ module Module
 #include "HsVersions.h"
 import OccName
 import Outputable
-import CmdLineOpts ( opt_Static, opt_CompilingPrelude )
+import CmdLineOpts ( opt_Static )
 
 \end{code}
 
@@ -165,8 +165,8 @@ mkPrelModule :: UserString -> Module
 mkPrelModule s = Module (_PK_ (encode s)) ilk
  where 
   ilk
-   | opt_Static || opt_CompilingPrelude = HiFile
-   | otherwise                         = HiDllFile
+   | opt_Static = HiFile
+   | otherwise = HiDllFile
 
 mkSrcModuleFS :: UserFS -> Module
 mkSrcModuleFS s = Module (encodeFS s) HiFile

diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index 0e14f7a..456ce08 100644 (file)
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -444,7 +444,7 @@ getAllFilesMatching dirs hims (dir_path, suffix) = ( do
     -- fpaths entries do not have dir_path prepended
   fpaths  <- getDirectoryContents dir_path
   is_dyns <- catch
-               (if dir_path == "." || opt_Static then
+               (if opt_Static || dir_path == "." then
                     return False
                 else
                     doesFileExist (dir_path ++ '/': dir_contain_dll_his))