diff options
| -rw-r--r-- | contrib/gcc/gcc.c | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/freebsd-native.h | 33 |
2 files changed, 19 insertions, 20 deletions
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c index 696a272..9c54245 100644 --- a/contrib/gcc/gcc.c +++ b/contrib/gcc/gcc.c @@ -3093,12 +3093,6 @@ process_command (argc, argv) case OBJFMT_UNKNOWN: fatal ("object format unknown"); } - add_prefix (&exec_prefixes, "/usr/libexec/", "GCC", - 0, 0, warn_std_ptr); - add_prefix (&exec_prefixes, "/usr/bin/", "GCC", - 0, 0, warn_std_ptr); - add_prefix (&startfile_prefixes, "/usr/libdata/gcc/", "BINUTILS", - 0, 0, warn_std_ptr); #else /* not FREEBSD_NATIVE */ #ifndef OS2 add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index 42bdb20..5260958 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -4,36 +4,41 @@ source tree so it can be configured appropriately without using the GNU configure/build mechanism. */ -/* Look for the include files in the system-defined places. */ +#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ +#undef GCC_INCLUDE_DIR /* We don't need one for now. */ +#undef TOOL_INCLUDE_DIR /* We don't need one for now. */ +#undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */ +/* Look for the include files in the system-defined places. */ #define GPLUSPLUS_INCLUDE_DIR "/usr/include/g++" #define GCC_INCLUDE_DIR "/usr/include" -/* Now that GCC knows what the include path applies to, put the G++ one first. - C++ can now have include files that override the default C ones. */ -#undef INCLUDE_DEFAULTS -#define INCLUDE_DEFAULTS \ - { \ - { GPLUSPLUS_INCLUDE_DIR, "C++", 1, 1 }, \ - { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \ - { 0, 0, 0, 0 } \ - } - /* Under FreeBSD, the normal location of the compiler back ends is the - /usr/libexec directory. */ + /usr/libexec directory. + + ``cc --print-search-dirs'' gives: + install: STANDARD_EXEC_PREFIX/(null) + programs: /usr/libexec/<OBJFORMAT>/:MD_EXEC_PREFIX + libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX + + We really don't need a "STANDARD_EXEC_PREFIX". However w/o it, + "--print-search-dirs" reports "install: /usr/local/lib/gcc-lib/(null)". + It is not harmful, but is just plain wrong. So we define a + "STANDARD_EXEC_PREFIX" to not be misleading. */ #undef STANDARD_EXEC_PREFIX -#undef TOOLDIR_BASE_PREFIX +#undef TOOLDIR_BASE_PREFIX /* Old?? This is not documented. */ #undef MD_EXEC_PREFIX #define STANDARD_EXEC_PREFIX "/usr/libexec/" -#define TOOLDIR_BASE_PREFIX "/usr/libexec/" #define MD_EXEC_PREFIX "/usr/libexec/" /* Under FreeBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */ #undef STANDARD_STARTFILE_PREFIX +#undef MD_STARTFILE_PREFIX /* We don't need one for now. */ + #define STANDARD_STARTFILE_PREFIX "/usr/lib/" /* FreeBSD is 4.4BSD derived */ |
