Changeset 135

Timestamp:

May 13, 2003, 5:57:49 PM (22 years ago)

Author:

bird

Message:

#416: Added library filename resolving similar to ld.

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -381 +381 @@
       list = list->next;
     }
+}
+
+
+/* Put a list of library arguments on to the command line or into the
+   response file. Filenames without path and extension will be 'resolved'
+   using libdirs and the LIB environment variable and a '.lib' extension.
+   If not found a search for a 'lib' prefixed filename is attempted, if
+   still not found we'll let link386 do the complaining and pass filename
+   unresolved to link386.
+
+   The motivation for doing this is to have the same behaviour of ld and
+   emxomfld which allows us to lax the libsomething.lib to something.lib
+   renaming and addapt to the gcc/unix library naming standards.
+   (see Innotek Defect #416)
+
+   Note. make_env () *must* be called before this function is called. */
+
+static void put_lib_args(const name_list *list)
+{
+  const char *pszLib = getenv ("LIB");
+  for (;list != NULL; list = list->next)
+    {
+      char  szFilename[260];
+      int   fFound = 0;
+
+      if (!strpbrk (list->name, ":\\/."))
+        { /* search for it */
+          const char *psz, *pszEnd;
+          for (psz = pszLib; !fFound && psz; psz = pszEnd + (pszEnd != NULL))
+            {
+              pszEnd = strchr(psz, ';');
+              if (pszEnd > psz)
+                {
+                  int  cchPath = pszEnd - psz;
+                  struct stat s;
+
+                  strncpy(szFilename, psz, pszEnd - psz);
+                  if (   szFilename[cchPath-1] != '\\'
+                      && szFilename[cchPath-1] != '/'
+                      && szFilename[cchPath-1] != ':')
+                    szFilename[cchPath++] = '\\';
+
+                  strcat(strcpy(szFilename + cchPath, list->name), ".lib");
+                  fFound = !stat(szFilename, &s);
+                  if (!fFound)
+                    {
+                      strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".lib");
+                      fFound = !stat(szFilename, &s);
+                    }
+                }
+            } /* foreach path in $LIB */
+        }
+
+      put_arg (fFound ? szFilename : list->name, TRUE, TRUE);
+    } /* foreach list entry */
 }
 
@@ -681 +736 @@
     linker_name = t;
 
+  /* Build the environment for LINK386.
+     This must be done before calling put_lib_args (). */
+
+  make_env ();
+
   /* Start building the LINK386 command line.  We can use a response
      file if the command line gets too long. */
@@ -795 +855 @@
   /* Put the library file names onto the command line. */
 
-  put_args (lib_fnames, TRUE);
+  put_lib_args (lib_fnames);
   put_arg (",", FALSE, FALSE);
 
@@ -803 +863 @@
   put_arg (";", FALSE, FALSE);
   arg_end ();
-
-  /* Build the environment for LINK386. */
-
-  make_env ();
 
   /* Call LINK386 via CMD.EXE (what a waste -- but I'm lazy) and abort