diff options
| author | ru <ru@FreeBSD.org> | 2002-05-16 15:22:58 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-05-16 15:22:58 +0000 |
| commit | af2650e805e3ff18099ecfced4eb103713610a19 (patch) | |
| tree | 26c910193f38e628273503d7190fb60a0a01427c | |
| parent | 4c312821280622c855258b87d1d63ac412edec55 (diff) | |
| download | FreeBSD-src-af2650e805e3ff18099ecfced4eb103713610a19.zip FreeBSD-src-af2650e805e3ff18099ecfced4eb103713610a19.tar.gz | |
MD_EXEC_PREFIX doesn't work for the cross-arch compiler.
The change also makes the `cc -print-search-dirs' output
sane (the pre-3.1 way) in the non-cross case.
Draft reviewed by: obrien
| -rw-r--r-- | contrib/gcc/gcc.c | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/freebsd-native.h | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c index 589f3a6..5f00e8c 100644 --- a/contrib/gcc/gcc.c +++ b/contrib/gcc/gcc.c @@ -1316,9 +1316,11 @@ static const char *gcc_exec_prefix; #ifndef TOOLDIR_BASE_PREFIX #define TOOLDIR_BASE_PREFIX "/usr/local/" #endif +#ifndef FREEBSD_NATIVE #ifndef STANDARD_BINDIR_PREFIX #define STANDARD_BINDIR_PREFIX "/usr/local/bin" #endif +#endif /* not FREEBSD_NATIVE */ static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; static const char *const standard_exec_prefix_1 = "/usr/lib/gcc/"; @@ -1333,7 +1335,9 @@ static const char *const standard_startfile_prefix_2 = "/usr/lib/"; static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX; static const char *tooldir_prefix; +#ifndef FREEBSD_NATIVE static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX; +#endif /* not FREEBSD_NATIVE */ /* Subdirectory to use for locating libraries. Set by set_multilib_dir based on the compilation options. */ @@ -3187,6 +3191,7 @@ process_command (argc, argv) /* Set up the default search paths. If there is no GCC_EXEC_PREFIX, see if we can create it from the pathname specified in argv[0]. */ +#ifndef FREEBSD_NATIVE #ifndef VMS /* FIXME: make_relative_prefix doesn't yet work for VMS. */ if (!gcc_exec_prefix) @@ -3197,6 +3202,7 @@ process_command (argc, argv) putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL)); } #endif +#endif /* not FREEBSD_NATIVE */ if (gcc_exec_prefix) { @@ -3841,9 +3847,9 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" #ifndef OS2 add_prefix (&exec_prefixes, standard_exec_prefix, "GCC", PREFIX_PRIORITY_LAST, 1, warn_std_ptr); -#ifndef FREEBSD_NATIVE add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", PREFIX_PRIORITY_LAST, 2, warn_std_ptr); +#ifndef FREEBSD_NATIVE add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS", PREFIX_PRIORITY_LAST, 2, warn_std_ptr); #endif /* not FREEBSD_NATIVE */ diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index 5a0a996..f4200d9 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -31,8 +31,9 @@ libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX */ #undef TOOLDIR_BASE_PREFIX /* Old?? This is not documented. */ +#undef STANDARD_BINDIR_PREFIX /* We don't need one for now. */ #define STANDARD_EXEC_PREFIX PREFIX"/libexec/" -#define MD_EXEC_PREFIX PREFIX"/libexec/" +#undef MD_EXEC_PREFIX /* We don't want one. */ /* Under FreeBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */ |
