cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When the same version of GCC is present as a port and in base, prefer

Browse Source 
the former.

Improve consistency of the code in on place.
This commit is contained in:
Gerald Pfeifer 2013-03-19 18:37:30 +00:00
parent d333852bb8
commit ff526d783e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=314673
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.gcc.mk
View File

@ -146,15 +146,13 @@ IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC})
.for v in ${GCCVERSIONS}
. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
_GCC_FOUND${v}= port
. endif
. if ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
. elif ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
. if exists(/usr/bin/gcc)
_GCC_FOUND${v}:= base
_GCC_FOUND${v}= base
. endif
. endif
.endfor
#
# 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