diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-06-13 10:45:46 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-06-13 10:45:46 +0000 |
| commit | b57128ecf16ea90042c5a395a068419cf5c55aa8 (patch) | |
| tree | 5a389005649e2645d013afeaa1864c3606d58602 | |
| parent | 03e53fff6fc2eda672b6d89316c6216e272943a5 (diff) | |
| download | pkgsrc-b57128ecf16ea90042c5a395a068419cf5c55aa8.tar.gz | |
Add USE_PKGSRC_GCC_RUNTIME support for gcc 4.8 and fix dependencies for
gcc packages. Bail out if runtime support is requested but we do not
provide runtime libraries for the chosen compiler.
| -rw-r--r-- | mk/compiler/gcc.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index abd0ef84e0f..1e7b8faaabf 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.136 2013/04/20 07:36:17 sbd Exp $ +# $NetBSD: gcc.mk,v 1.137 2013/06/13 10:45:46 jperkin Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -795,8 +795,14 @@ PREPEND_PATH+= ${_GCC_DIR}/bin # Add dependency on GCC libraries if requested. .if (defined(_USE_GCC_SHLIB) && !empty(_USE_GCC_SHLIB:M[Yy][Ee][Ss])) && !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) # Special case packages which are themselves a dependency of gcc runtime. -. if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) -. include "../../lang/gcc47-libs/buildlink3.mk" +. if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && empty(PKGPATH:Mlang/gcc??) +. if !empty(_GCC_VERSION:M4.7*) +. include "../../lang/gcc47-libs/buildlink3.mk" +. elif !empty(_GCC_VERSION:M4.8*) +. include "../../lang/gcc48-libs/buildlink3.mk" +. else +PKG_FAIL_REASON= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}" +. endif . endif .endif |