diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-12-15 18:12:03 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-12-15 18:12:03 +0000 |
| commit | fe7dff17591e17755b643f8f3cfadea49f83e16b (patch) | |
| tree | 2c5a7c659867c2c80fa883d63f0d83f1a6bf959c | |
| parent | 7f9175d999910fcb70513f06bcb913a63b6832af (diff) | |
| download | src-test-fe7dff17591e17755b643f8f3cfadea49f83e16b.tar.gz src-test-fe7dff17591e17755b643f8f3cfadea49f83e16b.zip | |
Remove additional GDB leftovers missed in r368667
Notes
Notes:
svn path=/head/; revision=368669
| -rw-r--r-- | Makefile.inc1 | 3 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1d19b9681ce21..6ca69da0f0bcb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 \ diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index e4f793e13aade..b31838503ded6 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f3a59db0409ee..ef8a71a6ebb96 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 |