Changeset View
Changeset View
Standalone View
Standalone View
gnu/usr.bin/cc/cc_tools/freebsd-native.h
Show All 9 Lines | |||||
#define FBSD_MAJOR 12 | #define FBSD_MAJOR 12 | ||||
#define FBSD_CC_VER 1200001 /* form like __FreeBSD_version */ | #define FBSD_CC_VER 1200001 /* form like __FreeBSD_version */ | ||||
#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ | #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ | ||||
#undef TOOL_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. */ | #undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */ | ||||
/* Look for the include files in the system-defined places. */ | /* Look for the include files in the system-defined places. */ | ||||
#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/"GCCVER | #define GPLUSPLUS_INCLUDE_DIR "/usr/include/c++/"GCCVER | ||||
bdrewery: Hm this looks in /usr/include/c++/4.2 but our -isystem is adding in /usr/include/c++/v1, so I… | |||||
jhbAuthorUnsubmitted Not Done Inline ActionsNo. We don't use libc++ when using GCC 4.2.1 because 4.2.1 can't compile C++11. When using 4.2.1 we still use libstdc++ from contrib and this preserves that behavior. jhb: No. We don't use libc++ when using GCC 4.2.1 because 4.2.1 can't compile C++11. When using 4. | |||||
bdreweryUnsubmitted Not Done Inline ActionsFunny enough I realized this while falling asleep the other night and almost got up to remove the comment. bdrewery: Funny enough I realized this while falling asleep the other night and almost got up to remove… | |||||
#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/"GCCVER"/backward" | #define GPLUSPLUS_BACKWARD_INCLUDE_DIR "/usr/include/c++/"GCCVER"/backward" | ||||
#define GCC_INCLUDE_DIR PREFIX"/include/gcc/"GCCVER | #define GCC_INCLUDE_DIR PREFIX"/include/gcc/"GCCVER | ||||
#ifdef CROSS_DIRECTORY_STRUCTURE | #define STANDARD_INCLUDE_DIR "/usr/include" | ||||
bdreweryUnsubmitted Not Done Inline ActionsThis change for STANDARD_INCLUDE_DIR and CROSS_INCLUDE_DIR seems like the primary fix to me. bdrewery: This change for `STANDARD_INCLUDE_DIR` and `CROSS_INCLUDE_DIR` seems like the primary fix to me. | |||||
#define CROSS_INCLUDE_DIR PREFIX"/include" | |||||
#else | |||||
#define STANDARD_INCLUDE_DIR PREFIX"/include" | |||||
#endif | |||||
/* Under FreeBSD, the normal location of the compiler back ends is the | /* Under FreeBSD, the normal location of the compiler back ends is the | ||||
/usr/libexec directory. | /usr/libexec directory. | ||||
``cc --print-search-dirs'' gives: | ``cc --print-search-dirs'' gives: | ||||
install: STANDARD_EXEC_PREFIX/ | install: STANDARD_EXEC_PREFIX/ | ||||
programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX | programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX | ||||
libraries: STANDARD_STARTFILE_PREFIX | libraries: STANDARD_STARTFILE_PREFIX | ||||
Show All 31 Lines |
Hm this looks in /usr/include/c++/4.2 but our -isystem is adding in /usr/include/c++/v1, so I think we'll still need the -isystem for C++ in Makefile.inc1. In which case the --sysroot fixes in contrib/gcc/cppdefault.c may not be needed.