Fri Apr 13 02:30:45 2012 UTC ()
Inorder to use a native gcc there must be a builtin gcc.


(sbd)
diff -r1.114 -r1.115 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.114 -r1.115 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2012/03/06 11:39:55 1.114
+++ pkgsrc/mk/compiler/gcc.mk 2012/04/13 02:30:45 1.115
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.114 2012/03/06 11:39:55 hans Exp $ 1# $NetBSD: gcc.mk,v 1.115 2012/04/13 02:30:45 sbd Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# USE_NATIVE_GCC 7# USE_NATIVE_GCC
8# When set to "yes", the native gcc is used, no matter which 8# When set to "yes", the native gcc is used, no matter which
9# compiler version a package requires. 9# compiler version a package requires.
10# 10#
11# Package-settable variables: 11# Package-settable variables:
12# 12#
13# GCC_REQD 13# GCC_REQD
14# The minimum version of the GNU Compiler Collection that is 14# The minimum version of the GNU Compiler Collection that is
@@ -383,27 +383,27 @@ _GCC_DEPENDENCY+= gcc3-f77>=${_GCC_REQD} @@ -383,27 +383,27 @@ _GCC_DEPENDENCY+= gcc3-f77>=${_GCC_REQD}
383_USE_GCC_SHLIB?= yes 383_USE_GCC_SHLIB?= yes
384. endif 384. endif
385. if !empty(PKGPATH:Mlang/gcc3-objc) 385. if !empty(PKGPATH:Mlang/gcc3-objc)
386_IGNORE_GCC3OBJC= yes 386_IGNORE_GCC3OBJC= yes
387MAKEFLAGS+= _IGNORE_GCC3OBJC=yes 387MAKEFLAGS+= _IGNORE_GCC3OBJC=yes
388. endif 388. endif
389. if !defined(_IGNORE_GCC3OBJC) && !empty(_LANGUAGES.gcc:Mobjc) 389. if !defined(_IGNORE_GCC3OBJC) && !empty(_LANGUAGES.gcc:Mobjc)
390_GCC_PKGSRCDIR+= ../../lang/gcc3-objc 390_GCC_PKGSRCDIR+= ../../lang/gcc3-objc
391_GCC_DEPENDENCY+= gcc3-objc>=${_GCC_REQD}:../../lang/gcc3-objc 391_GCC_DEPENDENCY+= gcc3-objc>=${_GCC_REQD}:../../lang/gcc3-objc
392_USE_GCC_SHLIB?= yes 392_USE_GCC_SHLIB?= yes
393. endif 393. endif
394.endif 394.endif
395 395
396.if !empty(USE_NATIVE_GCC:M[yY][eE][sS]) 396.if !empty(USE_NATIVE_GCC:M[yY][eE][sS]) && !empty(_IS_BUILTIN_GCC:M[yY][eE][sS])
397_USE_PKGSRC_GCC= no 397_USE_PKGSRC_GCC= no
398.endif 398.endif
399 399
400.if defined(_IGNORE_GCC) 400.if defined(_IGNORE_GCC)
401_USE_PKGSRC_GCC= NO 401_USE_PKGSRC_GCC= NO
402.endif 402.endif
403 403
404.if !defined(_USE_PKGSRC_GCC) 404.if !defined(_USE_PKGSRC_GCC)
405_USE_PKGSRC_GCC= YES 405_USE_PKGSRC_GCC= YES
406. if !empty(_IS_BUILTIN_GCC:M[yY][eE][sS]) 406. if !empty(_IS_BUILTIN_GCC:M[yY][eE][sS])
407_GCC_TEST_DEPENDS= gcc>=${_GCC_REQD} 407_GCC_TEST_DEPENDS= gcc>=${_GCC_REQD}
408_USE_PKGSRC_GCC!= \ 408_USE_PKGSRC_GCC!= \
409 if ${PKG_ADMIN} pmatch '${_GCC_TEST_DEPENDS}' ${_GCC_PKG} 2>/dev/null; then \ 409 if ${PKG_ADMIN} pmatch '${_GCC_TEST_DEPENDS}' ${_GCC_PKG} 2>/dev/null; then \