| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.1292 2023/01/13 16:00:33 christos Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.1293 2023/01/14 14:46:24 christos Exp $ |
2 | | | 2 | |
3 | # This needs to be before bsd.init.mk | | 3 | # This needs to be before bsd.init.mk |
4 | .if defined(BSD_MK_COMPAT_FILE) | | 4 | .if defined(BSD_MK_COMPAT_FILE) |
5 | .include <${BSD_MK_COMPAT_FILE}> | | 5 | .include <${BSD_MK_COMPAT_FILE}> |
6 | .endif | | 6 | .endif |
7 | | | 7 | |
8 | .if !defined(_BSD_OWN_MK_) | | 8 | .if !defined(_BSD_OWN_MK_) |
9 | _BSD_OWN_MK_=1 | | 9 | _BSD_OWN_MK_=1 |
10 | | | 10 | |
11 | MAKECONF?= /etc/mk.conf | | 11 | MAKECONF?= /etc/mk.conf |
12 | .-include "${MAKECONF}" | | 12 | .-include "${MAKECONF}" |
13 | | | 13 | |
14 | # | | 14 | # |
| @@ -90,27 +90,29 @@ EXTERNAL_GCC_SUBDIR?= gcc.old | | | @@ -90,27 +90,29 @@ EXTERNAL_GCC_SUBDIR?= gcc.old |
90 | EXTERNAL_GCC_SUBDIR?= gcc | | 90 | EXTERNAL_GCC_SUBDIR?= gcc |
91 | .else | | 91 | .else |
92 | EXTERNAL_GCC_SUBDIR?= /does/not/exist | | 92 | EXTERNAL_GCC_SUBDIR?= /does/not/exist |
93 | .endif | | 93 | .endif |
94 | .else | | 94 | .else |
95 | MKGCCCMDS?= no | | 95 | MKGCCCMDS?= no |
96 | .endif | | 96 | .endif |
97 | | | 97 | |
98 | # | | 98 | # |
99 | # What binutils is used? | | 99 | # What binutils is used? |
100 | # | | 100 | # |
101 | .if ${MACHINE_ARCH} == "x86_64" || \ | | 101 | .if ${MACHINE_ARCH} == "x86_64" || \ |
102 | ${MACHINE_ARCH} == "i386" || \ | | 102 | ${MACHINE_ARCH} == "i386" || \ |
103 | ${MACHINE_ARCH} == "alpha" | | 103 | ${MACHINE_ARCH} == "alpha" || \\ |
| | | 104 | !empty(MACHINE_ARCH:Maarch64*) || \ |
| | | 105 | !empty(MACHINE_ARCH:Msparc*) |
104 | HAVE_BINUTILS?= 239 | | 106 | HAVE_BINUTILS?= 239 |
105 | .else | | 107 | .else |
106 | HAVE_BINUTILS?= 234 | | 108 | HAVE_BINUTILS?= 234 |
107 | .endif | | 109 | .endif |
108 | | | 110 | |
109 | .if ${HAVE_BINUTILS} == 239 | | 111 | .if ${HAVE_BINUTILS} == 239 |
110 | EXTERNAL_BINUTILS_SUBDIR= binutils | | 112 | EXTERNAL_BINUTILS_SUBDIR= binutils |
111 | .elif ${HAVE_BINUTILS} == 234 | | 113 | .elif ${HAVE_BINUTILS} == 234 |
112 | EXTERNAL_BINUTILS_SUBDIR= binutils.old | | 114 | EXTERNAL_BINUTILS_SUBDIR= binutils.old |
113 | .else | | 115 | .else |
114 | EXTERNAL_BINUTILS_SUBDIR= /does/not/exist | | 116 | EXTERNAL_BINUTILS_SUBDIR= /does/not/exist |
115 | .endif | | 117 | .endif |
116 | | | 118 | |