Date: Tue, 13 Jan 2009 06:52:51 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r187131 - head/usr.sbin/crunch/crunchgen Message-ID: <200901130652.n0D6qpda092657@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Tue Jan 13 06:52:51 2009 New Revision: 187131 URL: http://svn.freebsd.org/changeset/base/187131 Log: Set .POSIX mode, along with disable parallel mode. Crunchgen parses the output from make(1) and its picky what it should look like. Also use make's conditional assignment operator rather than test and set. Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jan 13 06:08:37 2009 (r187130) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jan 13 06:52:51 2009 (r187131) @@ -709,12 +709,13 @@ void fillin_program_objs(prog_t *p, char if (outhdrname[0] != '\0') fprintf(f, ".include \"%s\"\n", outhdrname); fprintf(f, ".include \"%s\"\n", path); + fprintf(f, ".NOTPARALLEL:\n.NO_PARALLEL:\n.POSIX:\n"); if (buildopts) { fprintf(f, "BUILDOPTS+="); output_strlst(f, buildopts); } - fprintf(f, ".if defined(PROG) && !defined(%s)\n", objvar); - fprintf(f, "%s=${PROG}.o\n", objvar); + fprintf(f, ".if defined(PROG)\n"); + fprintf(f, "%s?=${PROG}.o\n", objvar); fprintf(f, ".endif\n"); fprintf(f, "loop:\n\t@echo 'OBJS= '${%s}\n", objvar); @@ -727,7 +728,7 @@ void fillin_program_objs(prog_t *p, char fclose(f); - snprintf(line, MAXLINELEN, "cd %s && make -f %s crunchgen_objs", + snprintf(line, MAXLINELEN, "cd %s && make -f %s -Q crunchgen_objs", p->srcdir, tempfname); if ((f = popen(line, "r")) == NULL) { warn("submake pipe");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901130652.n0D6qpda092657>