From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 19 Jun 2013 17:37:36 +0000 (+0200)
Subject: re PR driver/57651 (gcc-ar and gcc-nm don't find the lto plugin)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=216c12abf6eccbcf5c5ff1898e8b063a494af40c;p=gcc.git

re PR driver/57651 (gcc-ar and gcc-nm don't find the lto plugin)

	PR driver/57651
	* gcc-ar.c (main): If not CROSS_DIRECTORY_STRUCTURE, look for
	PERSONALITY in $PATH derived prefixes.

From-SVN: r200209
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd60452a5c7..8b6bc6f964b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR driver/57651
+	* gcc-ar.c (main): If not CROSS_DIRECTORY_STRUCTURE, look for
+	PERSONALITY in $PATH derived prefixes.
+
 2013-06-19  Jeff Law  <law@redhat.com>
 
 	* tree-ssa-forwprop.c (simplify_bitwise_binary_boolean): Fix typo
diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c
index bb6ed9fb78e..e3ad54b327e 100644
--- a/gcc/gcc-ar.c
+++ b/gcc/gcc-ar.c
@@ -147,21 +147,17 @@ main(int ac, char **av)
   exe_name = find_a_file (&target_path, PERSONALITY);
   if (!exe_name)
     {
+      const char *real_exe_name = PERSONALITY;
 #ifdef CROSS_DIRECTORY_STRUCTURE
-      const char *cross_exe_name;
-
-      cross_exe_name = concat (target_machine, "-", PERSONALITY, NULL);
-      exe_name = find_a_file (&path, cross_exe_name);
+      real_exe_name = concat (target_machine, "-", PERSONALITY, NULL);
+#endif
+      exe_name = find_a_file (&path, real_exe_name);
       if (!exe_name)
 	{
 	  fprintf (stderr, "%s: Cannot find binary '%s'\n", av[0],
-		   cross_exe_name);
+		   real_exe_name);
 	  exit (1);
 	}
-#else
-      fprintf (stderr, "%s: Cannot find binary '%s'\n", av[0], PERSONALITY);
-      exit (1);
-#endif
     }
 
   /* Create new command line with plugin */