diff options
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ldmain.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 07c86efc06..f6b7508163 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2018-02-28 Douglas B Rupp <rupp@adacore.com> + + * ldmain.c (main): Remove directory separator, if any, from the + end of the canonicalized sysroot. + 2018-02-27 H.J. Lu <hongjiu.lu@intel.com> * NEWS: Mention --enable-separate-code. diff --git a/ld/ldmain.c b/ld/ldmain.c index b6914db5da..6527613c98 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -228,7 +228,14 @@ main (int argc, char **argv) if (*ld_sysroot) ld_canon_sysroot = lrealpath (ld_sysroot); if (ld_canon_sysroot) - ld_canon_sysroot_len = strlen (ld_canon_sysroot); + { + ld_canon_sysroot_len = strlen (ld_canon_sysroot); + + /* is_sysrooted_pathname() relies on no trailing dirsep. */ + if (ld_canon_sysroot_len > 0 + && IS_DIR_SEPARATOR (ld_canon_sysroot [ld_canon_sysroot_len - 1])) + ld_canon_sysroot [--ld_canon_sysroot_len] = '\0'; + } else ld_canon_sysroot_len = -1; |