diff options
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 1 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/Makefile | 3 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 51e7630..8c89236 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -1,4 +1,5 @@ # $FreeBSD$ + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index 419d51c..9fcc5e9 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -94,7 +95,7 @@ CLEANFILES+= atomicity.cc INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1 -CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.2 +CXXINCLUDEDIR= ${INCLUDEDIR}/c++/${GCCVER} STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \ std_fstream.h std_functional.h std_iomanip.h std_ios.h \ diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index fc024e8..f2fe8837 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++/libsupc++ -.PATH: ${SRCDIR} ${GCCLIB}/libiberty +.PATH: ${SRCDIR} ${GCCLIB}/libiberty # Static only. LIB= supc++ @@ -27,7 +28,7 @@ PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} -INCSDIR=${INCLUDEDIR}/c++/4.2 +INCSDIR=${INCLUDEDIR}/c++/${GCCVER} unwind.h: ${GCCDIR}/unwind-generic.h ln -sf ${.ALLSRC} ${.TARGET} |
