Remove additional GDB leftovers missed in r368667

This commit is contained in:
Ed Maste 2020-12-15 18:12:03 +00:00
parent 7f9175d999
commit fe7dff1759
3 changed files with 2 additions and 9 deletions

View File

@ -761,7 +761,7 @@ TMAKE= \
XMAKE= ${BMAKE} \ XMAKE= ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \ MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \
MK_GDB=no MK_TESTS=no MK_TESTS=no
# kernel-tools stage # kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@ -2729,7 +2729,6 @@ NXBMAKEARGS+= \
MK_CLANG_FULL=no \ MK_CLANG_FULL=no \
MK_CTF=no \ MK_CTF=no \
MK_DEBUG_FILES=no \ MK_DEBUG_FILES=no \
MK_GDB=no \
MK_HTML=no \ MK_HTML=no \
MK_LLDB=no \ MK_LLDB=no \
MK_MAN=no \ MK_MAN=no \

View File

@ -6,7 +6,7 @@ SUBDIR=
SUBDIR.${MK_DIALOG}+= libdialog SUBDIR.${MK_DIALOG}+= libdialog
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests
.if ${MK_GNU_GREP} != "no" || ${MK_GDB} != "no" .if ${MK_GNU_GREP} != "no"
SUBDIR+= libregex SUBDIR+= libregex
.endif .endif

View File

@ -206,7 +206,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_FORMAT \ CLANG_FORMAT \
DTRACE_TESTS \ DTRACE_TESTS \
EXPERIMENTAL \ EXPERIMENTAL \
GDB \
GNU_GREP \ GNU_GREP \
HESIOD \ HESIOD \
LIBSOFT \ LIBSOFT \
@ -289,10 +288,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
.include <bsd.compiler.mk> .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*} != "" .if ${__T:Mriscv*} != ""
BROKEN_OPTIONS+=OFED BROKEN_OPTIONS+=OFED
.endif .endif
@ -481,7 +476,6 @@ MK_LLD_BOOTSTRAP:= no
.if ${MK_TOOLCHAIN} == "no" .if ${MK_TOOLCHAIN} == "no"
MK_CLANG:= no MK_CLANG:= no
MK_GDB:= no
MK_INCLUDES:= no MK_INCLUDES:= no
MK_LLD:= no MK_LLD:= no
MK_LLDB:= no MK_LLDB:= no