Date: Fri, 29 Mar 2013 11:26:15 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315538 - head/Mk Message-ID: <201303291126.r2TBQFU9062598@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Fri Mar 29 11:26:14 2013 New Revision: 315538 URL: http://svnweb.freebsd.org/changeset/ports/315538 Log: Merge two loops and initialize _GCC_FOUND${v} and check whether USE_GCC points to a valid version in parallel. Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Fri Mar 29 11:25:14 2013 (r315537) +++ head/Mk/bsd.gcc.mk Fri Mar 29 11:26:14 2013 (r315538) @@ -129,20 +129,8 @@ _GCC_ORLATER:= true . endif # ${USE_GCC} == any -# Check if USE_GCC points to a valid version. -.for v in ${GCCVERSIONS} -. if ${_USE_GCC}==${_GCCVERSION_${v}_V} -_GCCVERSION_OKAY= true; -. endif -.endfor - -.if !defined(_GCCVERSION_OKAY) -IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC}) -.endif - -# -# Initialize _GCC_FOUND${v}. -# +# Initialize _GCC_FOUND${v}. In parallel, check if USE_GCC points to a +# valid version to begin with. .for v in ${GCCVERSIONS} . if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//}) _GCC_FOUND${v}= port @@ -151,8 +139,15 @@ _GCC_FOUND${v}= port _GCC_FOUND${v}= base . endif . endif +. if ${_USE_GCC}==${_GCCVERSION_${v}_V} +_GCCVERSION_OKAY= true +. endif .endfor +.if !defined(_GCCVERSION_OKAY) +IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC}) +.endif + # If the GCC package defined in USE_GCC does not exist, but a later # version is allowed (for example 4.2+), see if there is a later. # First check if the base installed version is good enough, otherwise
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303291126.r2TBQFU9062598>