Remove some useless, commented out code. Remove name space polution in
the POSIX case by moving more things under !Posix part of an if.
This commit is contained in:
parent
dfd11a4413
commit
be4646cf7f
@ -74,10 +74,6 @@ CTFMERGE ?= ctfmerge
|
|||||||
DTRACE ?= dtrace
|
DTRACE ?= dtrace
|
||||||
.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
|
.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
|
||||||
CTFFLAGS += -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
|
.endif
|
||||||
|
|
||||||
CXX ?= c++
|
CXX ?= c++
|
||||||
@ -338,11 +334,7 @@ SHELL= ${__MAKE_SHELL}
|
|||||||
|
|
||||||
# Toggle on warnings
|
# Toggle on warnings
|
||||||
.WARN: dirsyntax
|
.WARN: dirsyntax
|
||||||
.endif
|
.else # is bmake
|
||||||
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(.PARSEDIR)
|
|
||||||
# Tell bmake to expand -V VAR by default
|
# Tell bmake to expand -V VAR by default
|
||||||
.MAKE.EXPAND_VARIABLES= yes
|
.MAKE.EXPAND_VARIABLES= yes
|
||||||
|
|
||||||
@ -359,7 +351,8 @@ SHELL= ${__MAKE_SHELL}
|
|||||||
echoFlag=v errFlag=e \
|
echoFlag=v errFlag=e \
|
||||||
path=${__MAKE_SHELL:U/bin/sh}
|
path=${__MAKE_SHELL:U/bin/sh}
|
||||||
.endif
|
.endif
|
||||||
|
.endif # bmake
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.cpu.mk>
|
.include <bsd.cpu.mk>
|
||||||
|
|
||||||
|
.endif # ! Posix
|
||||||
|
Loading…
Reference in New Issue
Block a user