From cab0e8ff75a14ede27c7379b6c04a759dd206e2e Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Sun, 19 Jul 2015 00:38:19 +0000 Subject: [PATCH] - Record dependencies of gdb/gdbtui/kgdb on binutils/lib{bfd,iberty,opcodes}, fixing parallel builds. - Don't build gdb/gdbtui/kgdb or libreadline when MK_BINUTILS is "no" for obvious reasons. MFC after: 3 days --- gnu/lib/Makefile | 2 +- gnu/usr.bin/Makefile | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 796cefcacc98..4fff36a48725 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -16,7 +16,7 @@ SUBDIR+= libssp SUBDIR+= tests .endif -.if ${MK_GDB} != "no" +.if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no" SUBDIR+= libreadline .endif diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 470b61220fa9..518000d65da7 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -16,6 +16,8 @@ SUBDIR= ${_binutils} \ sdiff \ ${_tests} +SUBDIR_DEPEND_gdb= ${_binutils} + .if ${MK_CXX} != "no" .if ${MK_GCC} != "no" _gperf= gperf @@ -39,13 +41,14 @@ _tests= tests .if ${MK_BINUTILS} != "no" _binutils= binutils -.endif -.if ${MK_GCC} != "no" -_cc= cc -.endif .if ${MK_GDB} != "no" _gdb= gdb .endif +.endif + +.if ${MK_GCC} != "no" +_cc= cc +.endif SUBDIR_PARALLEL=