diff options
Diffstat (limited to 'gnu/usr.bin/cc')
| -rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/freebsd-native.h | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/include/Makefile | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index f797dc7..1b7cbce 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -6,6 +6,7 @@ .if !defined(__CC_MAKEFILE_INC__) __CC_MAKEFILE_INC__= ${MFILE} +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs @@ -15,6 +16,7 @@ GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md GCC_TARGET= ${TARGET_ARCH}-undermydesk-freebsd +CFLAGS+= -DGCCVER=\"${GCCVER}\" CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}/usr\" #CFLAGS+= -DWANT_COMPILER_INVARIANTS diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index 6f7fd7b..db4dd89 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -15,9 +15,9 @@ #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 PREFIX"/include/c++/4.2" -#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/4.2/backward" -#define GCC_INCLUDE_DIR PREFIX"/include" +#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/"GCCVER +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/"GCCVER"/backward" +#define GCC_INCLUDE_DIR PREFIX"/include/gcc/"GCCVER #ifdef CROSS_COMPILE #define CROSS_INCLUDE_DIR PREFIX"/include" #else diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index 875cc1f..210218a 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -2,6 +2,8 @@ .include "../Makefile.inc" +INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} + .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" |
