Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools tools: allow MKCROSSGDB to work when not building gcc



details:   https://anonhg.NetBSD.org/src/rev/5b9b813e4156
branches:  trunk
changeset: 959271:5b9b813e4156
user:      dbj <dbj%NetBSD.org@localhost>
date:      Sat Feb 06 16:14:55 2021 +0000

description:
tools: allow MKCROSSGDB to work when not building gcc

diffstat:

 tools/Makefile |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (45 lines):

diff -r 4a1ba97ddf56 -r 5b9b813e4156 tools/Makefile
--- a/tools/Makefile    Sat Feb 06 16:07:13 2021 +0000
+++ b/tools/Makefile    Sat Feb 06 16:14:55 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.206 2020/07/28 21:38:15 uwe Exp $
+#      $NetBSD: Makefile,v 1.207 2021/02/06 16:14:55 dbj Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -25,26 +25,25 @@
 TOOLS_BUILDRUMP?=no
 
 .if ${TOOLCHAIN_MISSING} == "no"
-. if defined(HAVE_GCC) && ${HAVE_GCC} > 0
-TOOLCHAIN_BITS= gmake .WAIT
+. if (defined(HAVE_GCC) && ${HAVE_GCC} > 0) || \
+     (defined(HAVE_GDB) && ${HAVE_GDB} > 0 && ${MKCROSSGDB:Uno} != "no")
+TOOLCHAIN_BITS+= gmake .WAIT
 TOOLCHAIN_BITS+= gmp .WAIT
 TOOLCHAIN_BITS+= mpfr .WAIT
 TOOLCHAIN_BITS+= mpc .WAIT
 . endif
-.endif
 
-.if ${TOOLCHAIN_MISSING} == "no"
 TOOLCHAIN_BITS+= binutils .WAIT
-.endif
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} > 0
-. if ${TOOLCHAIN_MISSING} == "no"
+. if defined(HAVE_GCC) && ${HAVE_GCC} > 0
 TOOLCHAIN_BITS+= gcc
-.  if ${MKCROSSGDB:Uno} != "no" || make(obj)
+. endif
+
+. if defined(HAVE_GDB) && ${HAVE_GDB} > 0 && ${MKCROSSGDB:Uno} != "no"
 TOOLCHAIN_BITS+= gdb
-.  endif
+. endif
+
 TOOLCHAIN_BITS+= .WAIT
-. endif
 .endif
 
 .if defined(HAVE_PCC)



Home | Main Index | Thread Index | Old Index