From owner-cvs-src@FreeBSD.ORG Wed Aug 4 14:36:46 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4F4316A55A; Wed, 4 Aug 2004 14:36:45 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25CBC43D39; Wed, 4 Aug 2004 14:36:45 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i74Eabtm085995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 4 Aug 2004 17:36:37 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.12.11/8.12.11) id i74EaOLR026896; Wed, 4 Aug 2004 17:36:24 +0300 (EEST) (envelope-from ru) Date: Wed, 4 Aug 2004 17:36:24 +0300 From: Ruslan Ermilov To: Harti Brandt Message-ID: <20040804143624.GA26422@ip.net.ua> References: <200408031856.i73IuV8c082723@repoman.freebsd.org> <20040804121452.51ca6d98@Magellan.Leidinger.net> <20040804122057.V96634@beagle.kn.op.dlr.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tKW2IUtsqtDRztdT" Content-Disposition: inline In-Reply-To: <20040804122057.V96634@beagle.kn.op.dlr.de> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new cc: Alexander Leidinger cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/make Makefile main.c nonints.h var.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2004 14:36:46 -0000 --tKW2IUtsqtDRztdT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 04, 2004 at 12:25:10PM +0200, Harti Brandt wrote: [...] > Note also that you cannot do 'cd /usr/src/usr.bin ; > make SUBDIR=3D"last leave"' anymore. >=20 What do you mean? AFAIK, this never worked because SUBDIR was put as an environment variable into sub-makes, and {last,leave}/Makefile would be confused by thinking they have a non-empty SUBDIR (and then the ${PROG}: target and a subdir:: target from bsd.subdir.mk come to a conflict): $ /old/make SUBDIR=3D"last leave" regress =3D=3D=3D> last "/usr/share/mk/bsd.subdir.mk", line 60: Inconsistent operator for last make: fatal errors encountered -- cannot continue *** Error code 1 Stop in /usr/src/usr.bin. $ /new/make SUBDIR=3D"last leave" regress =3D=3D=3D> last "/usr/share/mk/bsd.subdir.mk", line 60: Inconsistent operator for last "/usr/share/mk/bsd.subdir.mk", line 66: warning: duplicate script for targe= t "last" ignored make: fatal errors encountered -- cannot continue *** Error code 1 Stop in /usr/src/usr.bin. > AL>Does this also apply to environment variables (CFLAGS=3D"foo bar" make= )? >=20 > No. Environment variables have lowest priority - command line variables > and makefiles override them. But you should be able to say > CFLAGS=3D"foo bar" make -E CFLAGS to move up CFLAGS in the priority list. >=20 Uh no. ``make CFLAGS=3D"foo bar"'' won't *work* because CFLAGS+=3D's won't DTRT, since command-line variables still take precedence over globals: $ cat makefile FOO=3D foo FOO+=3D bar all: =2Eif ${FOO} !=3D "foo bar" @echo impossible =2Eendif $ make FOO=3Dick impossible This commit isn't changing much, and the change is really natural. All it does it to ensure that once FOO is specified as a command line variable, it stays the command-line type variable in sub-makes. The other semantics is not touched. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --tKW2IUtsqtDRztdT Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFBEPRoqRfpzJluFF4RAtHbAJ9gr2BBxVEU0Mwio6rfJRkBry7RLACdEFDf p5QtVpu5CK8QwkKPJDcCuIU= =AnAL -----END PGP SIGNATURE----- --tKW2IUtsqtDRztdT--