summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-05-10 16:38:32 +0000
committerimp <imp@FreeBSD.org>2014-05-10 16:38:32 +0000
commit6b50de24a4557bdef8e5a0230433a0af98d434b8 (patch)
tree7d43223d307336d3c1450040fd5c0289e7b3677e /share
parent17be4ca340ad807121d6d6928062dd213a0394fd (diff)
downloadFreeBSD-src-6b50de24a4557bdef8e5a0230433a0af98d434b8.zip
FreeBSD-src-6b50de24a4557bdef8e5a0230433a0af98d434b8.tar.gz
Remove some useless, commented out code. Remove name space polution in
the POSIX case by moving more things under !Posix part of an if.
Diffstat (limited to 'share')
-rw-r--r--share/mk/sys.mk15
1 files changed, 4 insertions, 11 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 2f84319..f9ea0e2 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -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
OpenPOWER on IntegriCloud