Author: emaste
Date: Tue Dec 15 18:12:03 2020
New Revision: 368669
URL: https://svnweb.freebsd.org/changeset/base/368669

Log:
  Remove additional GDB leftovers missed in r368667

Modified:
  head/Makefile.inc1
  head/gnu/lib/Makefile
  head/share/mk/src.opts.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Tue Dec 15 17:52:04 2020        (r368668)
+++ head/Makefile.inc1  Tue Dec 15 18:12:03 2020        (r368669)
@@ -761,7 +761,7 @@ TMAKE=              \
 XMAKE=         ${BMAKE} \
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \
-               MK_GDB=no MK_TESTS=no
+               MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=     INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -2729,7 +2729,6 @@ NXBMAKEARGS+= \
        MK_CLANG_FULL=no \
        MK_CTF=no \
        MK_DEBUG_FILES=no \
-       MK_GDB=no \
        MK_HTML=no \
        MK_LLDB=no \
        MK_MAN=no \

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile       Tue Dec 15 17:52:04 2020        (r368668)
+++ head/gnu/lib/Makefile       Tue Dec 15 18:12:03 2020        (r368669)
@@ -6,7 +6,7 @@ SUBDIR=
 SUBDIR.${MK_DIALOG}+=  libdialog
 SUBDIR.${MK_TESTS}+=   tests
 
-.if ${MK_GNU_GREP} != "no" || ${MK_GDB} != "no"
+.if ${MK_GNU_GREP} != "no"
 SUBDIR+=               libregex
 .endif
 

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk   Tue Dec 15 17:52:04 2020        (r368668)
+++ head/share/mk/src.opts.mk   Tue Dec 15 18:12:03 2020        (r368669)
@@ -206,7 +206,6 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_FORMAT \
     DTRACE_TESTS \
     EXPERIMENTAL \
-    GDB \
     GNU_GREP \
     HESIOD \
     LIBSOFT \
@@ -289,10 +288,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 
 .include <bsd.compiler.mk>
 
-# In-tree gdb is an older versions without modern architecture support.
-.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
-BROKEN_OPTIONS+=GDB
-.endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
@@ -481,7 +476,6 @@ MK_LLD_BOOTSTRAP:= no
 
 .if ${MK_TOOLCHAIN} == "no"
 MK_CLANG:=     no
-MK_GDB:=       no
 MK_INCLUDES:=  no
 MK_LLD:=       no
 MK_LLDB:=      no
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to