diff options
| author | obrien <obrien@FreeBSD.org> | 2002-06-05 05:34:43 +0800 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-06-05 05:34:43 +0800 |
| commit | 881e3f4bb87ac09632ccf22e6446e6c7e654ead5 (patch) | |
| tree | 37120a2dd64ad8496dc57858af7bc5acc9303af2 | |
| parent | 3c95eff98510b22932331a3deaade42ac2accbad (diff) | |
| download | freebsd-ports-gnome-881e3f4bb87ac09632ccf22e6446e6c7e654ead5.tar.gz freebsd-ports-gnome-881e3f4bb87ac09632ccf22e6446e6c7e654ead5.tar.zst freebsd-ports-gnome-881e3f4bb87ac09632ccf22e6446e6c7e654ead5.zip | |
Add a new way to specify the GCC version your port needs.
Rather than USE_GCCXY, you now use USE_GCC=X.Y
Approved by: kris
| -rw-r--r-- | Mk/bsd.port.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d49194757df1..3c4e44f9bf9f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -141,9 +141,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # compression. # USE_ZIP - Says that the port distfile uses zip, not tar w/[bg]zip # for compression. -# USE_GCC295 - Says that the port requires this version of gcc, either in -# the system or installed from a port. -# USE_GCC30 - Says that the port requires this version of gcc, either in +# USE_GCC - Says that the port requires this version of gcc, either in # the system or installed from a port. # USE_GMAKE - Says that the port uses gmake. # GMAKE - Set to path of GNU make if not in $PATH (default: gmake). @@ -915,16 +913,16 @@ LIBTOOLFILES?= configure .endif LIBTOOLFLAGS?= --disable-ltlibs .endif -.if defined(USE_GCC295) && ${OSVERSION} < 400012 +.if defined(USE_GCC) && ${USE_GCC} == 2.95 && ( ${OSVERSION} < 400012 || ${OSVERSION} > 500034 ) CC= gcc295 CXX= g++295 BUILD_DEPENDS+= gcc295:${PORTSDIR}/lang/gcc295 MAKE_ENV+= CC=${CC} CXX=${CXX} .endif -.if defined(USE_GCC30) && ${OSVERSION} < 500999 -CC= gcc30 -CXX= g++30 -BUILD_DEPENDS+= gcc30:${PORTSDIR}/lang/gcc30 +.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ${OSVERSION} < 500035 +CC= gcc31 +CXX= g++31 +BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31 MAKE_ENV+= CC=${CC} CXX=${CXX} .endif |