diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2003-01-06 16:14:01 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2003-01-06 16:14:01 +0000 |
| commit | 0c7183f17cdc00fdaf4cd6ce96c2dc806d43b335 (patch) | |
| tree | 0ca21b813e3de83ac8a20ad75a529b3d94a4b16d /ld/ldfile.c | |
| parent | ad8dc5ea5afadcb9a97d8f597d70c1d345577bdc (diff) | |
| download | binutils-redhat-0c7183f17cdc00fdaf4cd6ce96c2dc806d43b335.tar.gz | |
* Makefile.am (eelf32iq10.c): Fix tab/whitespace mixup.
* Makefile.am (ldmain.o): Add @TARGET_SYSTEM_ROOT_DEFINE@.
(GENSCRIPTS): Add @use_sysroot@.
* Makefile.in: Regenerated.
* configure.host: Move setting of NATIVE_LIB_DIRS to...
* configure.tgt: ... here. Use ${target} instead of ${host}
for NATIVE_LIB_DIRS.
* configure.in: Add --with-sysroot.
* configure: Regenerated.
* genscripts.sh: Accept use_sysroot option. Set new variables
NATIVE and USE_LIBPATH. Prepend "=" to directory names if
$use_sysroot. Don't search $tool_lib if $use_sysroot.
* ldfile.c (ldfile_add_library_path): Handle leading '='.
* ldmain.c (TARGET_SYSTEM_ROOT): Define if not defined.
(ld_sysroot): New variable.
(main): Initialize ld_sysroot.
* ldmain.h (ld_sysroot): New extern.
* emultempl/elf32.em: Use NATIVE and USE_LIBPATH instead of
searching $EMULATION_LIBPATH.
(gld${EMULATION_NAME}_add_sysroot): New function.
(gld${EMULATION_NAME}_check_ld_so_conf): Use it. Honor ld_sysroot.
(gld${EMULATION_NAME}_after_open): Likewise. Only search
environment variables if $NATIVE.
* ld.texinfo (Options): Mention "=" prefix in the description of -L.
* NEWS: Mention --with-sysroot.
* emulparams/elf32bmipn32-defs.sh: Set NATIVE and LIBPATH_SUFFIX
instead of setting LIB_PATH.
* emulparams/elf32ppc.sh: Likewise.
* emulparams/elf64_s390.sh: Likewise.
* emulparams/elf64_sparc.sh: Likewise.
* emulparams/elf64ppc.sh: Likewise.
* emulparams/elf_x86_64.sh: Likewise.
* emulparams/elf64_aix.sh: Add "=" prefixes to LIB_PATH.
* emulparams/elf64hppa.sh: Add "=" prefixes to LIB_PATH.
Diffstat (limited to 'ld/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index 5b6f2efef5..bc1fd87c3a 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -1,5 +1,5 @@ /* Linker file opening and searching. - Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002 + Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -88,6 +88,11 @@ ldfile_add_library_path (name, cmdline) new->cmdline = cmdline; *search_tail_ptr = new; search_tail_ptr = &new->next; + + /* If a directory is marked as honoring sysroot, prepend the sysroot path + now. */ + if (new->name[0] == '=') + new->name = concat (ld_sysroot, &new->name[1], NULL); } /* Try to open a BFD for a lang_input_statement. */ |