diff options
| author | Aaron W. LaFramboise <aaronraolete36@aaronwl.com> | 2004-07-01 23:55:22 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@gcc.gnu.org> | 2004-07-01 23:55:22 +0000 |
| commit | 656c7a3a1a533d467f9564259cb0d76ed62f029b (patch) | |
| tree | c9d8a4ff46096ac1b499e243563c19c59274b028 /gcc/gcc.c | |
| parent | 78cc4167bcd0392c21b3db4682415245bfead558 (diff) | |
| download | gcc-656c7a3a1a533d467f9564259cb0d76ed62f029b.zip gcc-656c7a3a1a533d467f9564259cb0d76ed62f029b.tar.gz gcc-656c7a3a1a533d467f9564259cb0d76ed62f029b.tar.bz2 | |
gcc.c (STANDARD_STARTFILE_PREFIX_1): Define.
2004-07-02 Aaron W. LaFramboise <aaronraolete36@aaronwl.com>
* gcc.c (STANDARD_STARTFILE_PREFIX_1): Define.
(STANDARD_STARTFILE_PREFIX_2): Define.
(standard_startfile_prefix_1): Initialize to
STANDARD_STARTFILE_PREFIX_1.
(standard_startfile_prefix_2): Initialize to
STANDARD_STARTFILE_PREFIX_2.
* config/i386/mingw32.h (MD_STARTFILE_PREFIX): Remove.
(STANDARD_STARTFILE_PREFIX_1): Define.
(STANDARD_STARTFILE_PREFIX_2): Define.
* doc/tm.texi (STANDARD_STARTFILE_PREFIX_1): Document.
(STANDARD_STARTFILE_PREFIX_2): Document.
From-SVN: r84002
Diffstat (limited to 'gcc/gcc.c')
| -rw-r--r-- | gcc/gcc.c | 25 |
1 files changed, 19 insertions, 6 deletions
@@ -1429,6 +1429,13 @@ static const char *gcc_libexec_prefix; /* Default prefixes to attach to command names. */ +#ifndef STANDARD_STARTFILE_PREFIX_1 +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +#endif +#ifndef STANDARD_STARTFILE_PREFIX_2 +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +#endif + #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ #undef MD_EXEC_PREFIX #undef MD_STARTFILE_PREFIX @@ -1454,8 +1461,10 @@ static const char *md_exec_prefix = MD_EXEC_PREFIX; static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; -static const char *const standard_startfile_prefix_1 = "/lib/"; -static const char *const standard_startfile_prefix_2 = "/usr/lib/"; +static const char *const standard_startfile_prefix_1 + = STANDARD_STARTFILE_PREFIX_1; +static const char *const standard_startfile_prefix_2 + = STANDARD_STARTFILE_PREFIX_2; static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX; static const char *tooldir_prefix; @@ -6231,10 +6240,14 @@ main (int argc, const char **argv) NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); } - add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1, - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); - add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2, - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); + if (*standard_startfile_prefix_1) + add_sysrooted_prefix (&startfile_prefixes, + standard_startfile_prefix_1, "BINUTILS", + PREFIX_PRIORITY_LAST, 0, NULL, 1); + if (*standard_startfile_prefix_2) + add_sysrooted_prefix (&startfile_prefixes, + standard_startfile_prefix_2, "BINUTILS", + PREFIX_PRIORITY_LAST, 0, NULL, 1); #if 0 /* Can cause surprises, and one can use -B./ instead. */ add_prefix (&startfile_prefixes, "./", NULL, PREFIX_PRIORITY_LAST, 1, NULL, 0); |