[project @ 1999-10-04 14:03:47 by simonmar]

[ghc-hetmet.git] / ghc / driver / ghc.lprl

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index b044ed4..99baf9f 100644 (file)
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -279,6 +279,7 @@ these are turned off by -Wnot.
 \begin{code}
 @StandardWarnings = ('-fwarn-overlapping-patterns', 
                     '-fwarn-missing-methods',
+                    '-fwarn-missing-fields',
                     '-fwarn-duplicate-exports');
 @MinusWOpts              = (@StandardWarnings, 
                     '-fwarn-unused-binds',
@@ -1820,7 +1821,7 @@ Invoke the 'linker' - either the standard linker or the one used to build
 a (Win32) DLL.
 
 \begin{code}
-sub runLinker()
+sub runLinker
 {
     local($libdirs) = '';
 
@@ -1943,7 +1944,7 @@ EOSCRIPT2
     }
 }
 
-sub createWin32DLL()
+sub createWin32DLL
 {
     local ($libdirs);
 
@@ -1987,7 +1988,7 @@ sub createWin32DLL()
     &run_something($to_do, 'DLL creator');
 }
 
-sub prepareWin32DllLink ()
+sub prepareWin32DllLink
 {
     local($linking_main) = @_;
 
@@ -2009,8 +2010,8 @@ sub prepareWin32DllLink ()
          }
          push(@Link_file, ( $INSTALLING ) ? "$InstLibDirGhc/Main.dll_o"
                                          : "$TopPwd/$CURRENT_DIR/$GHC_RUNTIME_DIR/Main.dll_o") if $linking_main;
-         push(@Link_file, ( $INSTALLING ) ? "$InstLibDirGhc/PrelMain.o"
-                                         : "$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/PrelMain.o") if $linking_main;
+         push(@Link_file, ( $INSTALLING ) ? "$InstLibDirGhc/PrelMain.dll_o"
+                                         : "$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/std/PrelMain.dll_o") if $linking_main;
        }
        push(@Ld_flags,  "-mno-cygwin");
     }
@@ -2668,7 +2669,7 @@ sub check_for_source_options {
     open(FILE,$file) || return(1); # No big loss
     
     while (<FILE>) {
-       if ( /^${comment_start} OPTIONS (.*)${comment_end}$/ ) {
+       if ( /^${comment_start} OPTIONS (.*)${comment_end}/ ) {
            # add the options found at the back of the command line.
           local(@entries) = split(/\s+/,$1);
           print STDERR "Found OPTIONS " . join(' ',@entries) . " in $file\n" if $Verbose;