Module Name: src
Committed By: skrll
Date: Sun Jan 15 10:54:56 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Sort in the binutils version selection
To generate a diff of this commit:
cvs rdiff -u -r1.1294 -r1.1295 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1294 src/share/mk/bsd.own.mk:1.1295
--- src/share/mk/bsd.own.mk:1.1294 Sun Jan 15 10:51:04 2023
+++ src/share/mk/bsd.own.mk Sun Jan 15 10:54:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1294 2023/01/15 10:51:04 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1295 2023/01/15 10:54:56 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -98,11 +98,12 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
-.if ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "alpha" || \
+.if \
!empty(MACHINE_ARCH:Maarch64*) || \
- !empty(MACHINE_ARCH:Msparc*)
+ ${MACHINE_ARCH} == "alpha" || \
+ ${MACHINE_ARCH} == "i386" || \
+ !empty(MACHINE_ARCH:Msparc*) || \
+ ${MACHINE_ARCH} == "x86_64"
HAVE_BINUTILS?= 239
.else
HAVE_BINUTILS?= 234
