From: sewardj <unknown>
Date: Wed, 10 May 2000 16:51:52 +0000 (+0000)
Subject: [project @ 2000-05-10 16:51:52 by sewardj]
X-Git-Tag: Approximately_9120_patches~4521
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=f6af472e5394338ca7f663263f189b7336f918cb;hp=c75dc9b327e279f94a43c17683136818e307df75;p=ghc-hetmet.git

[project @ 2000-05-10 16:51:52 by sewardj]
findFilesForModule: search default library directories before looking
at user-supplied search paths.
---

diff --git a/ghc/interpreter/machdep.c b/ghc/interpreter/machdep.c
index 0ceff72..158fcf6 100644
--- a/ghc/interpreter/machdep.c
+++ b/ghc/interpreter/machdep.c
@@ -13,8 +13,8 @@
  * included in the distribution.
  *
  * $RCSfile: machdep.c,v $
- * $Revision: 1.30 $
- * $Date: 2000/04/12 09:43:10 $
+ * $Revision: 1.31 $
+ * $Date: 2000/05/10 16:51:52 $
  * ------------------------------------------------------------------------*/
 
 #ifdef HAVE_SIGNAL_H
@@ -628,11 +628,6 @@ Bool findFilesForModule (
       internal("moduleNameToFileNames: malloc failed(2)");
 
    augdPath[0] = 0;
-   strcat(augdPath, ".");
-   strcat(augdPath, PATHSEP_STR);
-
-   strcat(augdPath, hugsPath);
-   strcat(augdPath, PATHSEP_STR);
 
    if (combined) {
       strcat(augdPath, installDir);
@@ -648,6 +643,13 @@ Bool findFilesForModule (
    strcat(augdPath, "lib");
    strcat(augdPath, PATHSEP_STR);
 
+   /* these two were previously before the above `if' */
+   strcat(augdPath, ".");
+   strcat(augdPath, PATHSEP_STR);
+
+   strcat(augdPath, hugsPath);
+   strcat(augdPath, PATHSEP_STR);
+
    /* fprintf ( stderr, "augdpath = `%s'\n", augdPath ); */
 
    peEnd = augdPath-1;