From owner-svn-src-all@FreeBSD.ORG Sat May 10 16:38:33 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C44B206; Sat, 10 May 2014 16:38:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A7AD211; Sat, 10 May 2014 16:38:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGcWt8006785; Sat, 10 May 2014 16:38:32 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGcW77006784; Sat, 10 May 2014 16:38:32 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201405101638.s4AGcW77006784@svn.freebsd.org> From: Warner Losh Date: Sat, 10 May 2014 16:38:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265835 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 16:38:33 -0000 Author: imp Date: Sat May 10 16:38:32 2014 New Revision: 265835 URL: http://svnweb.freebsd.org/changeset/base/265835 Log: Remove some useless, commented out code. Remove name space polution in the POSIX case by moving more things under !Posix part of an if. Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sat May 10 16:38:27 2014 (r265834) +++ head/share/mk/sys.mk Sat May 10 16:38:32 2014 (r265835) @@ -74,10 +74,6 @@ CTFMERGE ?= ctfmerge DTRACE ?= dtrace .if defined(CFLAGS) && (${CFLAGS:M-g} != "") CTFFLAGS += -g -.else -# XXX: What to do here? Is removing the CFLAGS part completely ok here? -# For now comment it out to not compile with -g unconditionally. -#CFLAGS += -g .endif CXX ?= c++ @@ -338,11 +334,7 @@ SHELL= ${__MAKE_SHELL} # Toggle on warnings .WARN: dirsyntax -.endif - -.endif - -.if defined(.PARSEDIR) +.else # is bmake # Tell bmake to expand -V VAR by default .MAKE.EXPAND_VARIABLES= yes @@ -359,7 +351,8 @@ SHELL= ${__MAKE_SHELL} echoFlag=v errFlag=e \ path=${__MAKE_SHELL:U/bin/sh} .endif - -.endif +.endif # bmake .include + +.endif # ! Posix