svn commit: r265835 - head/share/mk
Warner Losh
imp at FreeBSD.org
Sat May 10 16:38:33 UTC 2014
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 <bsd.cpu.mk>
+
+.endif # ! Posix
More information about the svn-src-head
mailing list