* collect2.c (resolve_lib_name): Move '/' check to more rational place.

        * ginclude/stddef.h (NULL): define for non-gnu C++ parsers as 0.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34687 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 6 deletions

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 0313f465a71..d8905844330 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2993,14 +2993,14 @@ resolve_lib_name (name)
       struct prefix_list *list = libpaths[i]->plist;
       for (; list; list = list->next)
 	{
+	  /* The following lines are needed because path_prefix list
+	     may contain directories both with trailing '/' and
+	     without it.  */
+	  const char *p = "";
+	  if (list->prefix[strlen(list->prefix)-1] != '/')
+	    p = "/";
 	  for (j = 0; libexts[j]; j++)
 	    {
-              /* The following lines are needed because path_prefix list
-                 may contain directories both with trailing '/' and
-                 without it.  */
-              const char *p = "";
-              if (list->prefix[strlen(list->prefix)-1] != '/')
-                p = "/";
        	      sprintf (lib_buf, "%s%slib%s.%s",
 		       list->prefix, p, name, libexts[j]);
 if (debug) fprintf (stderr, "searching for: %s\n", lib_buf);