Fix upgrade of bmake by not setting conflicting MAKE_VERSION.
This may be used in later checks, such as in bsd.dep.mk, to enable features that rely on the built-in value. Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
125297980a
commit
80a5408c49
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=296644
@ -17,7 +17,7 @@ CLEANFILES+= bootstrap
|
|||||||
# $Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $
|
# $Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $
|
||||||
|
|
||||||
# Base version on src date
|
# Base version on src date
|
||||||
MAKE_VERSION= 20160307
|
_MAKE_VERSION= 20160307
|
||||||
|
|
||||||
PROG?= ${.CURDIR:T}
|
PROG?= ${.CURDIR:T}
|
||||||
|
|
||||||
@ -92,7 +92,7 @@ CFLAGS+= ${CPPFLAGS}
|
|||||||
CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
|
CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
|
||||||
CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE
|
CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE
|
||||||
CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
|
CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
|
||||||
COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
|
COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\""
|
||||||
|
|
||||||
# meta mode can be useful even without filemon
|
# meta mode can be useful even without filemon
|
||||||
FILEMON_H ?= /usr/include/dev/filemon/filemon.h
|
FILEMON_H ?= /usr/include/dev/filemon/filemon.h
|
||||||
|
Loading…
Reference in New Issue
Block a user