* gcc.c (STANDARD_EXEC_PREFIX, STANDARD_STARTFILE_PREFIX)

(TOOLDIR_BASE_PREFIX, STANDARD_BINDIR_PREFIX): Remove unnecessary
	definitions.
	(main): Only use standard_startfile_prefix if native.
	* doc/tm.texi (STANDARD_STARTFILE_PREFIX): Update.

From-SVN: r70877
This commit is contained in:
Daniel Jacobowitz 2003-08-28 00:39:32 +00:00 committed by Daniel Jacobowitz
parent f5cf58ddd8
commit 0d037580f6
3 changed files with 16 additions and 18 deletions

View File

@ -1,3 +1,11 @@
2003-08-27 Daniel Jacobowitz <drow@mvista.com>
* gcc.c (STANDARD_EXEC_PREFIX, STANDARD_STARTFILE_PREFIX)
(TOOLDIR_BASE_PREFIX, STANDARD_BINDIR_PREFIX): Remove unnecessary
definitions.
(main): Only use standard_startfile_prefix if native.
* doc/tm.texi (STANDARD_STARTFILE_PREFIX): Update.
2003-08-27 Per Bothner <pbothner@apple.com>
* cpperror.c (print_location): Don't check for !pfile->buffer. That

View File

@ -449,8 +449,10 @@ to the list of directories used to find the assembler in @file{configure.in}.
@defmac STANDARD_STARTFILE_PREFIX
Define this macro as a C string constant if you wish to override the
standard choice of @file{/usr/local/lib/} as the default prefix to
standard choice of @code{libdir} as the default prefix to
try when searching for startup files such as @file{crt0.o}.
@code{STANDARD_STARTFILE_PREFIX} is not searched when the compiler
is built as a cross compiler.
@end defmac
@defmac MD_STARTFILE_PREFIX

View File

@ -1402,21 +1402,6 @@ static const char *gcc_libexec_prefix;
#define MD_STARTFILE_PREFIX_1 ""
#endif
/* Supply defaults for the standard prefixes. */
#ifndef STANDARD_EXEC_PREFIX
#define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc/"
#endif
#ifndef STANDARD_STARTFILE_PREFIX
#define STANDARD_STARTFILE_PREFIX "/usr/local/lib/"
#endif
#ifndef TOOLDIR_BASE_PREFIX
#define TOOLDIR_BASE_PREFIX "/usr/local/"
#endif
#ifndef STANDARD_BINDIR_PREFIX
#define STANDARD_BINDIR_PREFIX "/usr/local/bin"
#endif
static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
@ -6121,12 +6106,15 @@ main (int argc, const char *const *argv)
/* If standard_startfile_prefix is relative, base it on
standard_exec_prefix. This lets us move the installed tree
as a unit. If GCC_EXEC_PREFIX is defined, base
standard_startfile_prefix on that as well. */
standard_startfile_prefix on that as well.
If the prefix is relative, only search it for native compilers;
otherwise we will search a directory containing host libraries. */
if (IS_ABSOLUTE_PATH (standard_startfile_prefix))
add_sysrooted_prefix (&startfile_prefixes,
standard_startfile_prefix, "BINUTILS",
PREFIX_PRIORITY_LAST, 0, NULL, 1);
else
else if (*cross_compile == '0')
{
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,