Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jun 2012 16:51:42 +0000 (UTC)
From:      Robert Millan <rmh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r237165 - head/share/mk
Message-ID:  <201206161651.q5GGpgX8055299@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rmh
Date: Sat Jun 16 16:51:42 2012
New Revision: 237165
URL: http://svn.freebsd.org/changeset/base/237165

Log:
  In CTFCONVERT_CMD initialization, check that ${MAKE_VERSION} is defined
  before using it. Bootstrap make (as built by usr.bin/make/Makefile.dist)
  does not define this variable, but it needs to parse bsd.own.mk in order
  to build a complete make.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jun 16 13:55:31 2012	(r237164)
+++ head/share/mk/bsd.own.mk	Sat Jun 16 16:51:42 2012	(r237165)
@@ -639,7 +639,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif ${MAKE_VERSION} >= 5201111300
+.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
 CTFCONVERT_CMD=
 .else
 CTFCONVERT_CMD=	@:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206161651.q5GGpgX8055299>