Date: Mon, 5 May 2014 18:16:16 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265378 - projects/bmake/share/mk Message-ID: <201405051816.s45IGG1Z027090@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Mon May 5 18:16:15 2014 New Revision: 265378 URL: http://svnweb.freebsd.org/changeset/base/265378 Log: WITHOUT always wins Reviewed by: imp Modified: projects/bmake/share/mk/bsd.mkopt.mk Modified: projects/bmake/share/mk/bsd.mkopt.mk ============================================================================== --- projects/bmake/share/mk/bsd.mkopt.mk Mon May 5 18:15:18 2014 (r265377) +++ projects/bmake/share/mk/bsd.mkopt.mk Mon May 5 18:16:15 2014 (r265378) @@ -30,7 +30,7 @@ MK_${var}:= yes # .for var in ${__DEFAULT_NO_OPTIONS} .if !defined(MK_${var}) -.if defined(WITH_${var}) # If both WITH and WITHOUT defined, WITH wins +.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT wins MK_${var}:= yes .else MK_${var}:= no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405051816.s45IGG1Z027090>