diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc/buildlink2.mk | 20 | ||||
| -rw-r--r-- | lang/gcc3/buildlink2.mk | 16 |
2 files changed, 6 insertions, 30 deletions
diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk index cedbe114993..461642f9bac 100644 --- a/lang/gcc/buildlink2.mk +++ b/lang/gcc/buildlink2.mk @@ -1,16 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.13 2003/07/13 13:04:09 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2003/09/12 13:03:40 grant Exp $ -# do not directly include this file. .include "../../mk/gcc.buildlink2.mk" -# to ensure the correct gcc package is selected based on USE_GCC2 and -# USE_GCC3. +# Do not directly include this file in package Makefiles. It is +# automatically included when required based on USE_GCC2. .if !defined(GCC2_BUILDLINK2_MK) GCC2_BUILDLINK2_MK= # defined -# If you want to allow EGCS to satisfy the GCC requirement, then set -# GCC_REQD to "2.8.0". -# -GCC_REQD?= 2.95.3 BUILDLINK_DEPENDS.gcc?= gcc>=${GCC_REQD} BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc @@ -25,20 +20,11 @@ BUILDLINK_DEPMETHOD.gcc?= build BUILDLINK_PREFIX.gcc= ${LOCALBASE} -_GCC_SUBPREFIX= gcc-2.95.3/ _GCC_PREFIX= ${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX} -_GCC_ARCHSUBDIR= lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3 -_GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} BUILDLINK_LDFLAGS.gcc= -L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib BUILDLINK_PACKAGES+= gcc -PATH:= ${_GCC_PREFIX}bin:${PATH} -CC= ${_GCC_PREFIX}bin/gcc -CPP= ${_GCC_PREFIX}bin/cpp -CXX= ${_GCC_PREFIX}bin/g++ -F77= ${_GCC_PREFIX}bin/g77 -PKG_FC= ${F77} .if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk index aeebfc89c37..a2283afff19 100644 --- a/lang/gcc3/buildlink2.mk +++ b/lang/gcc3/buildlink2.mk @@ -1,13 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:04:10 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2003/09/12 13:03:41 grant Exp $ -# do not directly include this file. .include "../../mk/gcc.buildlink2.mk" -# to ensure the correct gcc package is selected based on USE_GCC2 and -# USE_GCC3. +# Do not directly include this file in package Makefiles. It is +# automatically included when required based on USE_GCC3. .if !defined(GCC3_BUILDLINK2_MK) GCC3_BUILDLINK2_MK= # defined -GCC_REQD?= 3.3 BUILDLINK_DEPENDS.gcc?= gcc3>=${GCC_REQD} BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc3 @@ -22,23 +20,15 @@ BUILDLINK_DEPMETHOD.gcc?= build BUILDLINK_PREFIX.gcc= ${LOCALBASE} -_GCC_SUBPREFIX= gcc-3.3/ _GCC_PREFIX= ${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX} _GCC_LIBGCCDIR!= \ dirname `${_GCC_PREFIX}bin/gcc --print-libgcc-file-name` _GCC_ARCHSUBDIR= \ ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}||} -_GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} BUILDLINK_LDFLAGS.gcc= -L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib BUILDLINK_PACKAGES+= gcc -PATH:= ${_GCC_PREFIX}bin:${PATH} -CC= ${_GCC_PREFIX}bin/gcc -CPP= ${_GCC_PREFIX}bin/cpp -CXX= ${_GCC_PREFIX}bin/g++ -F77= ${_GCC_PREFIX}bin/g77 -PKG_FC= ${F77} .if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} |