pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/compiler mk: default to gfortran on aarch64, there'...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e949c90d094b
branches: trunk
changeset: 424728:e949c90d094b
user: nia <nia%pkgsrc.org@localhost>
date: Sat Mar 14 10:00:37 2020 +0000
description:
mk: default to gfortran on aarch64, there's no g95 for aarch64
diffstat:
mk/compiler/clang.mk | 6 +++++-
mk/compiler/gcc.mk | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diffs (42 lines):
diff -r 5b14dd392dbd -r e949c90d094b mk/compiler/clang.mk
--- a/mk/compiler/clang.mk Sat Mar 14 09:59:01 2020 +0000
+++ b/mk/compiler/clang.mk Sat Mar 14 10:00:37 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.21 2019/07/15 16:06:19 ryoon Exp $
+# $NetBSD: clang.mk,v 1.22 2020/03/14 10:00:37 nia Exp $
#
# This is the compiler definition for the clang compiler.
#
@@ -84,7 +84,11 @@
_LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}}
.endfor
+.if !empty(MACHINE_ARCH:Maarch64*)
+PKGSRC_FORTRAN?=gfortran
+.else
PKGSRC_FORTRAN?=g95
+.endif
.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77))
. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
diff -r 5b14dd392dbd -r e949c90d094b mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk Sat Mar 14 09:59:01 2020 +0000
+++ b/mk/compiler/gcc.mk Sat Mar 14 10:00:37 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.208 2019/09/19 06:46:59 rillig Exp $
+# $NetBSD: gcc.mk,v 1.209 2020/03/14 10:00:37 nia Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -1049,7 +1049,11 @@
# The default is g95 as it supports a modern dialect, but it can
# be overridden in mk.conf to use only f2c.
#
+.if !empty(MACHINE_ARCH:Maarch64*)
+PKGSRC_FORTRAN?=gfortran
+.else
PKGSRC_FORTRAN?=g95
+.endif
_GCC_NEEDS_A_FORTRAN= no
.if empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !exists(${FCPATH})
Home |
Main Index |
Thread Index |
Old Index