[project @ 1999-12-03 14:38:39 by sewardj]

Make the combined/standalone switch, +c/-c, work at all :-)

diff --git a/ghc/interpreter/hugs.c b/ghc/interpreter/hugs.c
index bb91b46..76e5549 100644 (file)
--- a/ghc/interpreter/hugs.c
+++ b/ghc/interpreter/hugs.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: hugs.c,v $
- * $Revision: 1.26 $
- * $Date: 1999/12/03 12:39:38 $
+ * $Revision: 1.27 $
+ * $Date: 1999/12/03 14:38:39 $
  * ------------------------------------------------------------------------*/
 
 #include <setjmp.h>
@@ -97,6 +97,8 @@ static Void   local browse          Args((Void));
  * Machine dependent code for Hugs interpreter:
  * ------------------------------------------------------------------------*/
 
+       Bool   combined      = FALSE;
+
 #include "machdep.c"
 #ifdef WANT_TIMER
 #include "timer.c"
@@ -115,7 +117,6 @@ static Bool   quiet         = FALSE;    /* TRUE => don't show progress     */
 static Bool   lastWasObject = FALSE;
        Bool   preludeLoaded = FALSE;
        Bool   debugSC       = FALSE;
-       Bool   combined      = TRUE; //FALSE;
 
 typedef 
    struct { 
@@ -304,7 +305,6 @@ String argv[]; {
    argc = prog_argc; argv = prog_argv;
 
    namesUpto = numScripts = 0;
-   addStackEntry("Prelude");
 
    for (i=1; i<argc; ++i) {            /* process command line arguments  */
         if (strcmp(argv[i], "--")==0) break;
@@ -321,6 +321,8 @@ String argv[]; {
         }
     }
 
+   addStackEntry("Prelude");
+
 #if DEBUG
     { 
        char exe_name[N_INSTALLDIR + 6];

diff --git a/ghc/interpreter/machdep.c b/ghc/interpreter/machdep.c
index ace1420..cbe9d54 100644 (file)
--- a/ghc/interpreter/machdep.c
+++ b/ghc/interpreter/machdep.c
@@ -13,8 +13,8 @@
  * included in the distribution.
  *
  * $RCSfile: machdep.c,v $
- * $Revision: 1.15 $
- * $Date: 1999/12/03 12:39:42 $
+ * $Revision: 1.16 $
+ * $Date: 1999/12/03 14:38:39 $
  * ------------------------------------------------------------------------*/
 
 #ifdef HAVE_SIGNAL_H
@@ -681,9 +681,11 @@ Bool findFilesForModule (
    strcat(augdPath, hugsPath);
    strcat(augdPath, PATHSEP_STR);
 
-   strcat(augdPath, installDir);
-   strcat(augdPath, "GhcPrel");
-   strcat(augdPath, PATHSEP_STR);
+   if (combined) {
+      strcat(augdPath, installDir);
+      strcat(augdPath, "GhcPrel");
+      strcat(augdPath, PATHSEP_STR);
+   }
 
    strcat(augdPath, installDir);
    strcat(augdPath, "lib");