mk: Improve NetBSD earm GCC hack.

NetBSD · Oct 24, 2023 · d3dd470 · d3dd470
1 parent 52fb58f
commit d3dd470
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/mk/compiler/gcc-reqd.mk b/mk/compiler/gcc-reqd.mk
@@ -273,14 +273,6 @@ _NEED_GCC_AUX=		yes
 PKG_FAIL_REASON+=	"Invalid GCC_REQD: ${_GCC_REQD}"
 .endif
 
-# GCC below 10 from pkgsrc is broken on 32-bit arm NetBSD.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) && ${OPSYS_VERSION} < 099900 && \
-    (${_NEED_GCC8:tl} == "yes" || ${_NEED_GCC9:tl} == "yes")
-_NEED_GCC8=	no
-_NEED_GCC9=	no
-_NEED_GCC10=	yes
-.endif
-
 #
 # Set the required GCC dependency variables based on which _NEED_GCC* is set
 # to "yes" above.  Allow them to be overridden, useful if for example the user

diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
@@ -156,6 +156,13 @@ OPSYS_HAS_CIRCLEQ=	# defined
 # library packages.
 USE_PKGSRC_GCC_RUNTIME?=	yes
 
+# GCC below 10 from pkgsrc is broken on 32-bit arm NetBSD.
+.if ${MACHINE_ARCH:Mearm*} && ${OPSYS_VERSION} < 099900
+.  if ${GCC_REQD:M8*} || ${GCC_REQD:M9*}
+GCC_REQD+=	10
+.  endif
+.endif
+
 # Register support for FORTIFY (with GCC)
 # Disable on older versions, see:
 # http://mail-index.netbsd.org/pkgsrc-users/2017/08/07/msg025435.html