[project @ 1999-06-16 09:59:16 by simonmar]

Urk, more fixes.  This thing *really* needs to be taken out and shot.

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 6b04bb0..fedb756 100644 (file)
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -908,7 +908,9 @@ sub setupBuildFlags {
       $BuildTag = '_t';
 
   } elsif ( $UNREGing eq 'u' ) {
-      $BuildTag = '_u';
+      if ($GhcWithRegisterised eq 'YES') {
+        $BuildTag = '_u';
+      }
   }
 \end{code}
 
@@ -939,8 +941,6 @@ Decide what the consistency-checking options are in force for this run:
 
        if ($CompilingPrelude) {
          $HiSuffix_prelude = "$HiSuffix" if $CompilingPrelude;
-       } elsif ($BuildTag eq '_u' && $GhcWithRegisterised eq 'NO') {
-        $HiSuffix_prelude = 'hi';
        } else {
          local($Tag) = "${BuildTag}";