diff options
| author | grant <grant> | 2003-07-18 04:21:16 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-07-18 04:21:16 +0000 |
| commit | 3d13a20af544e689cad903829521eb8cdd426b09 (patch) | |
| tree | 8ebc15eb09344700a8c19cfa0f42beda1f54ae0e /mk | |
| parent | 8cb9a8e5d029f9027bf38c9fd788c9632307026c (diff) | |
| download | pkgsrc-3d13a20af544e689cad903829521eb8cdd426b09.tar.gz | |
only include gcc.buildlink2.mk if we are not using the MIPSpro or SunPro
compiler.
don't include the buildlink2.mk of the gcc package being built.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
| -rw-r--r-- | mk/gcc.buildlink2.mk | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index dc6f4504ead..ca51cff96ca 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216 2003/07/13 13:27:18 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1217 2003/07/18 04:21:16 grant Exp $ # # This file is in the public domain. # @@ -326,7 +326,9 @@ MAKE_ENV+= CPP="${CPP}" # USE_SUNPRO - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio # Compiler Collection # -.include "../../mk/gcc.buildlink2.mk" +.if !defined(USE_MIPSPRO) && !defined(USE_SUNPRO) +. include "../../mk/gcc.buildlink2.mk" +.endif # export the flags needed to compile and link pthreaded code MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" diff --git a/mk/gcc.buildlink2.mk b/mk/gcc.buildlink2.mk index 6cb7a134a44..2d97e5f8ce1 100644 --- a/mk/gcc.buildlink2.mk +++ b/mk/gcc.buildlink2.mk @@ -1,7 +1,7 @@ -# $NetBSD: gcc.buildlink2.mk,v 1.2 2003/07/09 08:25:04 salo Exp $ +# $NetBSD: gcc.buildlink2.mk,v 1.3 2003/07/18 04:21:17 grant Exp $ # # USE_GCC2 -# If defined, use gcc from lang/gcc (default). +# If defined, use gcc from lang/gcc. # USE_GCC3 # If defined, use gcc3 from lang/gcc3. # @@ -9,11 +9,9 @@ .if !defined(GCC_BUILDLINK2_MK) GCC_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" - -.if defined(USE_GCC3) +.if defined(USE_GCC3) && empty(PKGPATH:Mlang/gcc3) . include "../lang/gcc3/buildlink2.mk" -.elif defined(USE_GCC2) +.elif defined(USE_GCC2) && empty(PKGPATH:Mlang/gcc) . include "../lang/gcc/buildlink2.mk" .endif |