summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2010-10-17 11:24:50 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2010-10-17 11:24:50 +0000
commitce3294519440f8b80599d89d50e65121161bb06d (patch)
tree45bb0276637ee4cbb3800df9713799515ad0dd00 /Mk
parentUpdate to OOO330_m11 (3.3beta). (diff)
Simplify the case of USE_FORTRAN=g77. Update a comment.
Discussed with: bf
Notes
Notes: svn path=/head/; revision=263140
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gcc.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index 0d2d45b977e5..4f73d7959309 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -65,10 +65,9 @@ _GCCVERSION_${v}_V= ${j}
. endfor
.endfor
-#
-# bsd.gcc.mk can also be used only for FC, F77 settings; in this case we
-# do not define USE_GCC.
-#
+# bsd.gcc.mk can also be used for primarily requesting a Fortran compiler.
+# If we are using GCC we still define whatever we'd usually do for C and
+# C++ as well.
.if defined (USE_FORTRAN)
@@ -89,12 +88,9 @@ F77:= ${LOCALBASE}/intel_fc_80/bin/ifort
# (FreeBSD<=6).
. elif ${USE_FORTRAN} == g77
. if (${OSVERSION} > 700042)
-BUILD_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34
-RUN_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34
+_USE_GCC:= 3.4
FC:= g77-34
F77:= g77-34
-CC:= gcc34
-CXX:= g++34
. else
F77:= f77
FC:= f77