Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the make(1) command lines generated by crunchgen from:

Browse Source 
"make -a -b VAR=VALUE -c -d target" to
"make -a -b -c -d VAR=VALUE target"

to avoid depending on make's undocumented and unportably-implemented
handling of the former case.

Makes crunchgen and nbmake work together on Cygwin.
This commit is contained in:
nathanw 2003-11-19 22:44:15 +00:00
parent f2fdecfc92
commit 31bbd833a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/crunch/crunchgen/crunchgen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $ */
/* $NetBSD: crunchgen.c,v 1.52 2003/11/19 22:44:15 nathanw Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $");
__RCSID("$NetBSD: crunchgen.c,v 1.52 2003/11/19 22:44:15 nathanw Exp $");
#endif
#include <stdlib.h>
@ -629,7 +629,7 @@ void fillin_program_objs(prog_t *p, char *dirpath)
fclose(f);
(void)snprintf(line, sizeof(line),
"cd %s && %s -B CRUNCHEDPROG=1 -f %s %s crunchgen_objs 2>&1", dirpath,
"cd %s && %s -B -f %s %s CRUNCHEDPROG=1 crunchgen_objs 2>&1", dirpath,
makebin, tempfname, makeflags);
if((f = popen(line, "r")) == NULL) {
perror("submake pipe");
@ -898,7 +898,7 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
p->ident, p->ident, p->ident);
fprintf(outmk, "\tprintf \".PATH: ${%s_SRCDIR}\\n.CURDIR:= ${%s_SRCDIR}\\n"
".include \\\"\\$${.CURDIR}/Makefile\\\"\\n\" \\\n", p->ident, p->ident);
fprintf(outmk, "\t| ${MAKE} CRUNCHEDPROG=1 DBG=\"${DBG}\" -f- depend ${%s_OBJS}\n\n",
fprintf(outmk, "\t| ${MAKE} -f- CRUNCHEDPROG=1 DBG=\"${DBG}\" depend ${%s_OBJS}\n\n",
p->ident);
}
else