diff options
| author | Nick Clifton <nickc@redhat.com> | 2017-05-18 15:07:59 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-05-18 15:07:59 +0100 |
| commit | 3aa2d05a728216bbb99dbb5718be9bb36429cf41 (patch) | |
| tree | 634ea00884160b88e1c0c55154b963ab3652e077 /ld/ldfile.c | |
| parent | 59cc050d893d1e8c75547de950a35e809588f12f (diff) | |
| download | binutils-gdb-3aa2d05a728216bbb99dbb5718be9bb36429cf41.tar.gz | |
Treat a prefix of "$SYSROOT" in the same way as "=" when parsing linker search paths.
PR ld/21251
* ldfile.c (ldfile_add_library_path): If the path starts with
$SYSROOT then use the sysroot as the real prefix.
* ldlang.c (lang_add_input_file): Treat $SYSROOT in the same
way as =.
* ldlex.l: Add $SYSROOT as allow prefix for a filename.
* ld.texinfo (-L): Document that $SYSROOT acts like = when
prefixing a library search path.
(INPUT): Likewise.
* testsuite/ld-scripts/sysroot-prefix.exp: Add $SYSROOT prefix
tests.
Diffstat (limited to 'ld/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index 0943bb2dfa0..3b37a0a3e26 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -112,6 +112,8 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) now. */ if (name[0] == '=') new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); + else if (CONST_STRNEQ (name, "$SYSROOT")) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); } |