CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 08:01:48 UTC 2022

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

Log Message:
gfortran: Correct notion of check. All pkgsrc gccs before version 10 are
broken on 32-bit arm.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 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.18 pkgsrc/mk/compiler/gfortran.mk:1.19
--- pkgsrc/mk/compiler/gfortran.mk:1.18 Sat Apr  2 07:57:11 2022
+++ pkgsrc/mk/compiler/gfortran.mk      Sat Apr  2 08:01:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.18 2022/04/02 07:57:11 nia Exp $
+# $NetBSD: gfortran.mk,v 1.19 2022/04/02 08:01:48 nia Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -43,8 +43,12 @@ POSSIBLE_GFORTRAN_VERSION?=  ${CC_VERSION
 
 # 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*))
+    !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
+POSSIBLE_GFORTRAN_VERSION=     10
+.endif
+
+.if ${POSSIBLE_GFORTRAN_VERSION} <= 9 && \
+    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif