| 1 |
Author: grobian |
| 2 |
Date: 2009-03-21 13:14:16 +0000 (Sat, 21 Mar 2009) |
| 3 |
New Revision: 1641 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/toolchain-prefix-wrapper/ld/gnuplugin.c |
| 7 |
Log: |
| 8 |
if we happen to find that the first part (up till : or EOS) of -R is not a path, make sure we push the entire original argument back, not just the first part (up till :) as that may not be everything, and does break the transparent behaviour. |
| 9 |
|
| 10 |
Modified: trunk/toolchain-prefix-wrapper/ld/gnuplugin.c |
| 11 |
=================================================================== |
| 12 |
--- trunk/toolchain-prefix-wrapper/ld/gnuplugin.c 2009-03-21 13:07:54 UTC (rev 1640) |
| 13 |
+++ trunk/toolchain-prefix-wrapper/ld/gnuplugin.c 2009-03-21 13:14:16 UTC (rev 1641) |
| 14 |
@@ -99,11 +99,13 @@ |
| 15 |
if (colon) |
| 16 |
*next = ':'; |
| 17 |
/* if argument to "-R" is not a directory, then |
| 18 |
- * it is not a rpath */ |
| 19 |
+ * it is not a rpath, make sure we push out the |
| 20 |
+ * entire argument in that case, and not just |
| 21 |
+ * everything up to the first : */ |
| 22 |
if (rv != 0 || (sbuf.st_mode & S_IFDIR) == 0) { |
| 23 |
if (StringListAppendConcat(data->out->argList |
| 24 |
, _R, _R_len |
| 25 |
- , curr, next - curr |
| 26 |
+ , curr, -1 |
| 27 |
, NULL) < 0) |
| 28 |
{ |
| 29 |
/* failed to append arg */ |
Archives