diff options
| -rw-r--r-- | Mk/Uses/fortran.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.gcc.mk | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index fa265c4a9812..890eaaf94700 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -18,7 +18,7 @@ fortran_ARGS= gcc .if ${fortran_ARGS} == gcc .include "${PORTSDIR}/Mk/bsd.default-versions.mk" _GCC_VER= ${GCC_DEFAULT:S/.//} -.if ${_GCC_VER} == 48 +.if ${GCC_DEFAULT} == ${LANG_GCC_IS} BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc .else diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8bcb27635237..a88b4eba9498 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -33,4 +33,7 @@ RUBY_DEFAULT?= 2.0 TCLTK_DEFAULT?= 8.6 FIREBIRD_DEFAULT?= 2.5 +# Version of lang/gcc. Do not override! +LANG_GCC_IS= 4.8 + .endif diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index 822caf9f610f..66c9e2f57364 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -47,9 +47,6 @@ GCCVERSION_040800= 0 0 4.8 GCCVERSION_040900= 0 0 4.9 GCCVERSION_050000= 0 0 5 -# Version of lang/gcc -LANG_GCC_IS= 4.8 - # No configurable parts below this. #################################### # |