CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 07:57:11 UTC 2022

Modified Files:
        pkgsrc/mk/compiler: gfortran.mk

Log Message:
gfortran.mk: Use gcc version 10 on all arm-type netbsds.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mk/compiler/gfortran.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/gfortran.mk
diff -u pkgsrc/mk/compiler/gfortran.mk:1.17 pkgsrc/mk/compiler/gfortran.mk:1.18
--- pkgsrc/mk/compiler/gfortran.mk:1.17 Sun Apr 25 07:51:25 2021
+++ pkgsrc/mk/compiler/gfortran.mk      Sat Apr  2 07:57:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.17 2021/04/25 07:51:25 mrg Exp $
+# $NetBSD: gfortran.mk,v 1.18 2022/04/02 07:57:11 nia Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -41,8 +41,10 @@ COMPILER_GFORTRAN_MK=        defined
 # in that case.
 POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:S/gcc-//:C/.[0-9].[0-9]$//}
 
-# gcc9 doesn't work on NetBSD/aarch64, but gcc10 does.
-.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
+# gcc9 doesn't work on NetBSD/arm, but gcc10 does.
+.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && \
+    (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*))
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif