pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/compiler Match against CC_VERSION rather than _GCC_...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4b321bbb54c8
branches: trunk
changeset: 621433:4b321bbb54c8
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Jul 09 10:13:43 2013 +0000
description:
Match against CC_VERSION rather than _GCC_VERSION, the latter is not defined
in the USE_PKGSRC_GCC case.
diffstat:
mk/compiler/gcc.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (21 lines):
diff -r 00c12e18f988 -r 4b321bbb54c8 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk Tue Jul 09 08:50:34 2013 +0000
+++ b/mk/compiler/gcc.mk Tue Jul 09 10:13:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.141 2013/06/15 22:32:18 wiz Exp $
+# $NetBSD: gcc.mk,v 1.142 2013/07/09 10:13:43 jperkin Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -794,9 +794,9 @@
.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) && empty(PKGPATH:Mlang/gcc??)
-. if !empty(_GCC_VERSION:M4.7*)
+. if !empty(CC_VERSION:Mgcc-4.7*)
. include "../../lang/gcc47-libs/buildlink3.mk"
-. elif !empty(_GCC_VERSION:M4.8*)
+. elif !empty(CC_VERSION:Mgcc-4.8*)
. include "../../lang/gcc48-libs/buildlink3.mk"
. else
PKG_FAIL_REASON= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}"
Home |
Main Index |
Thread Index |
Old Index