Wed Apr 15 21:28:08 2020 UTC ()
switch ppc to the new binutils


(christos)
diff -r1.1180 -r1.1181 src/share/mk/bsd.own.mk
cvs diff -r1.1180 -r1.1181 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2020/04/04 23:54:06 1.1180
+++ src/share/mk/bsd.own.mk 2020/04/15 21:28:08 1.1181
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1180 2020/04/04 23:54:06 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1181 2020/04/15 21:28:08 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
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -159,27 +159,28 @@ USE_SSP?= yes @@ -159,27 +159,28 @@ USE_SSP?= yes
159HAVE_GDB?= 830 159HAVE_GDB?= 830
160 160
161.if ${HAVE_GDB} == 830 161.if ${HAVE_GDB} == 830
162EXTERNAL_GDB_SUBDIR= gdb 162EXTERNAL_GDB_SUBDIR= gdb
163.elif ${HAVE_GDB} == 801 163.elif ${HAVE_GDB} == 801
164EXTERNAL_GDB_SUBDIR= gdb.old 164EXTERNAL_GDB_SUBDIR= gdb.old
165.else 165.else
166EXTERNAL_GDB_SUBDIR= /does/not/exist 166EXTERNAL_GDB_SUBDIR= /does/not/exist
167.endif 167.endif
168 168
169# 169#
170# What binutils is used? 170# What binutils is used?
171# 171#
172.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" 172.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
 173 ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" \
173HAVE_BINUTILS?= 234 174HAVE_BINUTILS?= 234
174.else 175.else
175HAVE_BINUTILS?= 231 176HAVE_BINUTILS?= 231
176.endif 177.endif
177 178
178.if ${HAVE_BINUTILS} == 234 179.if ${HAVE_BINUTILS} == 234
179EXTERNAL_BINUTILS_SUBDIR= binutils 180EXTERNAL_BINUTILS_SUBDIR= binutils
180.elif ${HAVE_BINUTILS} == 231 181.elif ${HAVE_BINUTILS} == 231
181EXTERNAL_BINUTILS_SUBDIR= binutils.old 182EXTERNAL_BINUTILS_SUBDIR= binutils.old
182.else 183.else
183EXTERNAL_BINUTILS_SUBDIR= /does/not/exist 184EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
184.endif 185.endif
185 186