Date: Sun, 04 Jan 2009 10:07:55 -0700 (MST) From: "M. Warner Losh" <imp@bsdimp.com> To: obrien@freebsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186713 - head/usr.bin/make Message-ID: <20090104.100755.686402162.imp@bsdimp.com> In-Reply-To: <200901031014.n03AE1lA022458@svn.freebsd.org> References: <200901031014.n03AE1lA022458@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <200901031014.n03AE1lA022458@svn.freebsd.org>
"David E. O'Brien" <obrien@freebsd.org> writes:
: Author: obrien
: Date: Sat Jan 3 10:14:01 2009
: New Revision: 186713
: URL: http://svn.freebsd.org/changeset/base/186713
:
: Log:
: + Add the -Q be-quiet flag for parallel jobs.
: - Enable -Q by default for the moment - there is something weird
: going on in the rescue build.
This seems to also include other things not related to -Q, is that
intentional:
: Modified: head/usr.bin/make/var.c
: ==============================================================================
: --- head/usr.bin/make/var.c Sat Jan 3 05:32:37 2009 (r186712)
: +++ head/usr.bin/make/var.c Sat Jan 3 10:14:01 2009 (r186713)
: @@ -946,12 +946,14 @@ VarFindAny(const char name[], GNode *ctx
: * The name and val arguments are duplicated so they may
: * safely be freed.
: */
: -static void
: +static Var *
: VarAdd(const char *name, const char *val, GNode *ctxt)
: {
: + Var *v;
:
: - Lst_AtFront(&ctxt->context, VarCreate(name, val, 0));
: + Lst_AtFront(&ctxt->context, v = VarCreate(name, val, 0));
: DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val));
: + return (v);
: }
:
: /**
: @@ -1004,30 +1006,22 @@ Var_Set(const char *name, const char *va
: n = VarPossiblyExpand(name, ctxt);
: v = VarFindOnly(n, ctxt);
: if (v == NULL) {
: - VarAdd(n, val, ctxt);
: - if (ctxt == VAR_CMD) {
: - /*
: - * Any variables given on the command line
: - * are automatically exported to the
: - * environment (as per POSIX standard)
: - */
: - setenv(n, val, 1);
: - }
: + v = VarAdd(n, val, ctxt);
: } else {
: Buf_Clear(v->val);
: Buf_Append(v->val, val);
: -
: - if (ctxt == VAR_CMD || (v->flags & VAR_TO_ENV)) {
: - /*
: - * Any variables given on the command line
: - * are automatically exported to the
: - * environment (as per POSIX standard)
: - */
: - setenv(n, val, 1);
: - }
: DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, n, val));
: }
:
: + if (ctxt == VAR_CMD || (v->flags & VAR_TO_ENV)) {
: + /*
: + * Any variables given on the command line
: + * are automatically exported to the
: + * environment (as per POSIX standard)
: + */
: + setenv(n, val, 1);
: + }
: +
: free(n);
: }
:
: @@ -2325,7 +2319,8 @@ match_var(const char str[], const char v
: * None. The old string must be freed by the caller
: */
: Buffer *
: -Var_Subst(const char *str, GNode *ctxt, Boolean err)
: +//Var_Subst(const char *var, const char *str, GNode *ctxt, Boolean undefErr)
: +Var_Subst( const char *str, GNode *ctxt, Boolean err)
: {
: Boolean errorReported;
: Buffer *buf; /* Buffer for forming things */
:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090104.100755.686402162.imp>