CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 14 10:00:38 UTC 2020

Modified Files:
        pkgsrc/mk/compiler: clang.mk gcc.mk

Log Message:
mk: default to gfortran on aarch64, there's no g95 for aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.208 -r1.209 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/clang.mk
diff -u pkgsrc/mk/compiler/clang.mk:1.21 pkgsrc/mk/compiler/clang.mk:1.22
--- pkgsrc/mk/compiler/clang.mk:1.21    Mon Jul 15 16:06:19 2019
+++ pkgsrc/mk/compiler/clang.mk Sat Mar 14 10:00:37 2020
@@ -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=    # empty
 _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"

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.208 pkgsrc/mk/compiler/gcc.mk:1.209
--- pkgsrc/mk/compiler/gcc.mk:1.208     Thu Sep 19 06:46:59 2019
+++ pkgsrc/mk/compiler/gcc.mk   Sat Mar 14 10:00:37 2020
@@ -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 @@ ${_GCC_${_var_}}:
 # 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})