summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-27 17:34:04 +0000
committerjlam <jlam>2002-08-27 17:34:04 +0000
commit385eac2cd5e2bbc7d5d485965b8ac8648acfa015 (patch)
treef89df1ce205fc644b3c81f8ac9eaf38cb69fd287 /mk
parent817709759213cafd9fefcd164e50658b4e9f8fd8 (diff)
downloadpkgsrc-385eac2cd5e2bbc7d5d485965b8ac8648acfa015.tar.gz
FC and F77 point to the same thing, so no need to create wrappers for
both of them -- just create wrappers for one, then set the appropriate env vars to handle the other one.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink2/bsd.buildlink2.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index c8de97ca92b..d1fb3f77f73 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.4 2002/08/23 00:27:59 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.5 2002/08/27 17:34:04 jlam Exp $
#
# An example package buildlink2.mk file:
#
@@ -343,7 +343,7 @@ _BLNK_TRANSFORM_SED.3+= \
#
_BLNK_WRAPPEES= AS CC CXX CPP LD
.if defined(USE_FORTRAN)
-_BLNK_WRAPPEES+= FC F77
+_BLNK_WRAPPEES+= FC
.endif
.if defined(USE_LIBTOOL)
PKGLIBTOOL= ${BUILDLINK_LIBTOOL}
@@ -425,6 +425,11 @@ _BLNK_WRAP_LOGIC.${_wrappee_}= ${_BLNK_WRAP_LOGIC_TRANSFORM}
_BLNK_WRAP_ENV.AS= # empty
_BLNK_WRAP_ENV.CPP= # empty
+# Also override any F77 value in the environment when compiling Fortran
+# code.
+#
+_BLNK_WRAP_ENV.FC+= F77="${BUILDLINK_FC:T}"
+
# Don't override the default LIBTOOL setting in the environment, as
# it already correctly points to ${PKGLIBTOOL}, and don't sanitize the PATH
# because we want libtool to invoke the wrapper scripts, too.