diff options
| -rw-r--r-- | Mk/Uses/fortran.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.gcc.mk | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 9265e1e509ce..2e3fab0322ac 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -17,13 +17,8 @@ fortran_ARGS= gcc .if ${fortran_ARGS} == gcc _GCC_VER= ${GCC_DEFAULT:S/.//} -.if ${GCC_DEFAULT} == ${LANG_GCC_IS} -BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc -RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc -.else BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} -.endif USE_BINUTILS= yes F77= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 65d22008ff10..ee5e5ee6b3bc 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -140,7 +140,4 @@ TCLTK_DEFAULT?= 8.6 # Possible values: 4, 5 VARNISH_DEFAULT?= 4 -# Version of lang/gcc. Do not override! -LANG_GCC_IS= 5 - .endif diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index 453fdb9a99a8..08ce6bee0f40 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -144,11 +144,7 @@ _USE_GCC:= ${GCC_DEFAULT} . if ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc) V:= ${_GCCVERSION_${v}_V:S/.//} _GCC_PORT_DEPENDS:= gcc${V} -. if ${_USE_GCC} == ${LANG_GCC_IS} -_GCC_PORT:= gcc -. else _GCC_PORT:= gcc${V} -. endif CC:= gcc${V} CXX:= g++${V} CPP:= cpp${V} |