Skip to content

Commit

Permalink
Remove additional GDB leftovers missed in r368667
Browse files Browse the repository at this point in the history
  • Loading branch information
emaste committed Dec 15, 2020
1 parent 7f9175d commit fe7dff1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion gnu/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 0 additions & 6 deletions share/mk/src.opts.mk
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_FORMAT \
DTRACE_TESTS \
EXPERIMENTAL \
GDB \
GNU_GREP \
HESIOD \
LIBSOFT \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fe7dff1

Please sign in to comment.