Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Sep 2015 18:57:31 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r288391 - head
Message-ID:  <201509291857.t8TIvVJH027579@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Sep 29 18:57:30 2015
New Revision: 288391
URL: https://svnweb.freebsd.org/changeset/base/288391

Log:
  Fix the .MAKE added in r251750 to properly support the historical -n -n.
  
  The condition used matches the condition in sys.mk for setting _+_ to blank
  or +.
  
  With this -n will continue to not descend into Makefile.inc1, while -n -n will
  and cause Makefile.inc1's target to run with -n.
  
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Tue Sep 29 18:51:56 2015	(r288390)
+++ head/Makefile	Tue Sep 29 18:57:30 2015	(r288391)
@@ -243,9 +243,9 @@ cleanworld:
 # Handle the user-driven targets, using the source relative mk files.
 #
 
-.if empty(.MAKEFLAGS:M-n)
+.if !(!empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n")
 # skip this for -n to avoid changing previous behavior of 
-# 'make -n buildworld' etc.
+# 'make -n buildworld' etc.  Using -n -n will run it.
 ${TGTS}: .MAKE
 tinderbox toolchains kernel-toolchains: .MAKE
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509291857.t8TIvVJH027579>