From 3aa2d05a728216bbb99dbb5718be9bb36429cf41 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 18 May 2017 15:07:59 +0100 Subject: 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. --- ld/ldfile.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ld/ldfile.c') diff --git a/ld/ldfile.c b/ld/ldfile.c index 0943bb2..3b37a0a 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); } -- cgit v1.1