[llvm-branch-commits] [llvm-gcc-branch] r130188 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ driverdriver.c

[Bob Wilson]

Author: bwilson
Date: Mon Apr 25 23:09:34 2011
New Revision: 130188

URL: http://llvm.org/viewvc/llvm-project?rev=130188&view=rev
Log:
Radar 9335669: Fix driver-driver to handle multiple levels of sym links.
--- Merging r105535 into '.':
U    driverdriver.c

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 25 23:09:34 2011
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,129022,129946,129957
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105535,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,129022,129946,129957

Modified: llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c?rev=130188&r1=130187&r2=130188&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/driverdriver.c Mon Apr 25 23:09:34 2011
@@ -1306,8 +1306,8 @@
 
   /* If argv[0] is a symbolic link, use the directory of the pointed-to file
      to find compiler components. */
-
-  if ((linklen = readlink (argv[0], path_buffer, PATH_MAX)) != -1)
+  /* LLVM LOCAL: loop to follow multiple levels of links */
+  while ((linklen = readlink (argv[0], path_buffer, PATH_MAX)) != -1)
     {
       /* readlink succeeds if argv[0] is a symlink.  path_buffer now contains
 	 the file referenced. */