diff options
| author | joerg <joerg@pkgsrc.org> | 2010-04-20 13:32:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-04-20 13:32:15 +0000 |
| commit | 75156626a2b9871f49248f4d7653cef0267f9214 (patch) | |
| tree | bfc75dd360e181f365d9d55eae81b6553d89b2ef /devel/bmake/files/job.c | |
| parent | 1869e779310e24b43754c694c616566fa8eca3d7 (diff) | |
| download | pkgsrc-75156626a2b9871f49248f4d7653cef0267f9214.tar.gz | |
Import bmake-20100414:
- Resolve argv[0] with realpath if needed
- Add :tA to realpath(3)ify variables
- Support for .info, .warning, .error, .ERROR
- Unit tests for .ERROR / .error; never make .ERROR the default target
- Fix for .ALLSRC being populated twice
- Support for .MAKE_MODE, .MAKE.MAKEFILE_PREFERENCE, .MAKE_DEPENDFILE
- Haiku support
- Improved diagnostics for .for with multiple variables
- Rewrite bootstrap to not use make
- Fix for -m .../
- Add support for .unexport
- Catch typoes in .el*if etc
- Fix parsing of :S;...;...; applied to .for loop iterators appearing in
dependency lines
Diffstat (limited to 'devel/bmake/files/job.c')
| -rw-r--r-- | devel/bmake/files/job.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/bmake/files/job.c b/devel/bmake/files/job.c index 0ea5ac12c8d..1b0c8367be7 100644 --- a/devel/bmake/files/job.c +++ b/devel/bmake/files/job.c @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.1.1.5 2009/09/18 20:55:27 joerg Exp $ */ +/* $NetBSD: job.c,v 1.1.1.6 2010/04/20 13:32:27 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.1.1.5 2009/09/18 20:55:27 joerg Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.1.1.6 2010/04/20 13:32:27 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.1.1.5 2009/09/18 20:55:27 joerg Exp $"); +__RCSID("$NetBSD: job.c,v 1.1.1.6 2010/04/20 13:32:27 joerg Exp $"); #endif #endif /* not lint */ #endif @@ -1239,8 +1239,8 @@ Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...)) static const char msg[] = ": don't know how to make"; if (gn->flags & FROM_DEPEND) { - fprintf(stdout, "%s: ignoring stale .depend for %s\n", - progname, gn->name); + fprintf(stdout, "%s: ignoring stale %s for %s\n", + progname, makeDependfile, gn->name); return TRUE; } @@ -1911,7 +1911,7 @@ JobRun(GNode *targ) #else Compat_Make(targ, targ); if (targ->made == ERROR) { - PrintOnError("\n\nStop."); + PrintOnError(targ, "\n\nStop."); exit(1); } #endif @@ -2241,7 +2241,7 @@ Job_Init(void) if (begin != NULL) { JobRun(begin); if (begin->made == ERROR) { - PrintOnError("\n\nStop."); + PrintOnError(begin, "\n\nStop."); exit(1); } } |