| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.1086 2018/12/24 21:51:57 christos Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.1087 2018/12/25 00:35:26 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 | # |
| @@ -140,27 +140,27 @@ HAVE_GDB?= 801 | | | @@ -140,27 +140,27 @@ HAVE_GDB?= 801 |
140 | | | 140 | |
141 | .if ${HAVE_GDB} == 801 | | 141 | .if ${HAVE_GDB} == 801 |
142 | EXTERNAL_GDB_SUBDIR= gdb | | 142 | EXTERNAL_GDB_SUBDIR= gdb |
143 | .elif ${HAVE_GDB} == 712 | | 143 | .elif ${HAVE_GDB} == 712 |
144 | EXTERNAL_GDB_SUBDIR= gdb.old | | 144 | EXTERNAL_GDB_SUBDIR= gdb.old |
145 | .else | | 145 | .else |
146 | EXTERNAL_GDB_SUBDIR= /does/not/exist | | 146 | EXTERNAL_GDB_SUBDIR= /does/not/exist |
147 | .endif | | 147 | .endif |
148 | | | 148 | |
149 | # | | 149 | # |
150 | # What binutils is used? | | 150 | # What binutils is used? |
151 | # | | 151 | # |
152 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" | | 152 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" |
153 | HAVE_BINUTILS?= 231 | | 153 | HAVE_BINUTILS?= 227 |
154 | .else | | 154 | .else |
155 | HAVE_BINUTILS?= 227 | | 155 | HAVE_BINUTILS?= 227 |
156 | .endif | | 156 | .endif |
157 | | | 157 | |
158 | .if ${HAVE_BINUTILS} == 231 | | 158 | .if ${HAVE_BINUTILS} == 231 |
159 | EXTERNAL_BINUTILS_SUBDIR= binutils | | 159 | EXTERNAL_BINUTILS_SUBDIR= binutils |
160 | .elif ${HAVE_BINUTILS} == 227 | | 160 | .elif ${HAVE_BINUTILS} == 227 |
161 | EXTERNAL_BINUTILS_SUBDIR= binutils.old | | 161 | EXTERNAL_BINUTILS_SUBDIR= binutils.old |
162 | .else | | 162 | .else |
163 | EXTERNAL_BINUTILS_SUBDIR= /does/not/exist | | 163 | EXTERNAL_BINUTILS_SUBDIR= /does/not/exist |
164 | .endif | | 164 | .endif |
165 | | | 165 | |
166 | .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*) | | 166 | .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*) |