From 951e4d1c91d5ab16be4356093ad4acc6ce5dda60 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 20 Jan 2005 10:49:03 +0000 Subject: [PATCH] In crunchgen(1), when calling make(1), don't redirect stderr to stdout, just rely on the exit status to detect an error. This makes crunchgen(1) safe to use with certain make(1) debugging flags. MFC after: 1 week --- Makefile.inc1 | 2 +- usr.sbin/crunch/crunchgen/crunchgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 023e3b29e3e3..8b1db9162f3d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -780,7 +780,7 @@ _yacc= usr.bin/yacc .endif .if !defined(NO_RESCUE) && \ - ${BOOTSTRAPPING} < 502128 + ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen .endif diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 7984d543921e..ff8b6eca6119 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -700,7 +700,7 @@ void fillin_program_objs(prog_t *p, char *path) fclose(f); - snprintf(line, MAXLINELEN, "cd %s && make -f %s crunchgen_objs 2>&1", + snprintf(line, MAXLINELEN, "cd %s && make -f %s crunchgen_objs", p->srcdir, tempfname); if ((f = popen(line, "r")) == NULL) { warn("submake pipe");