Date: Fri, 21 Apr 2017 13:39:15 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317252 - head/gnu/usr.bin Message-ID: <201704211339.v3LDdFxk009446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri Apr 21 13:39:14 2017 New Revision: 317252 URL: https://svnweb.freebsd.org/changeset/base/317252 Log: Simplify gnu/usr.bin Makefile conditions After r307655 MK_GDB is forced to no if MK_BINUTILS is no, and similarly MK_GROFF is forced to no if MK_CXX is no, so we can remove nested conditionals. Reviewed by: bapt, brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D8287 Modified: head/gnu/usr.bin/Makefile Modified: head/gnu/usr.bin/Makefile ============================================================================== --- head/gnu/usr.bin/Makefile Fri Apr 21 11:48:12 2017 (r317251) +++ head/gnu/usr.bin/Makefile Fri Apr 21 13:39:14 2017 (r317252) @@ -5,21 +5,17 @@ .if ${MK_CXX} != "no" SUBDIR.${MK_GCC}+= gperf -SUBDIR.${MK_GROFF}+= groff .endif SUBDIR.${MK_BINUTILS}+= binutils SUBDIR.${MK_DIALOG}+= dialog - -.if ${MK_BINUTILS} != "no" -SUBDIR.${MK_GDB}+= gdb -SUBDIR_DEPEND_gdb= binutils -.endif - SUBDIR.${MK_GCC}+= cc SUBDIR.${MK_GNU_DIFF}+= diff3 SUBDIR.${MK_GNU_GREP}+= grep +SUBDIR.${MK_GDB}+= gdb +SUBDIR_DEPEND_gdb= binutils SUBDIR.${MK_GPL_DTC}+= dtc +SUBDIR.${MK_GROFF}+= groff SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704211339.v3LDdFxk009446>