summaryrefslogtreecommitdiffstats
path: root/contrib/bmake
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-08-04 07:10:16 +0000
committersjg <sjg@FreeBSD.org>2013-08-04 07:10:16 +0000
commit5d2437d56f280f49cf0e57f124f9ab98211ddb13 (patch)
treef65d123af4de15ed359648ce0e12edab740a9459 /contrib/bmake
parentcbd7fe2b24d8f0b3ad6d6dad1cc3804f62921b2d (diff)
downloadFreeBSD-src-5d2437d56f280f49cf0e57f124f9ab98211ddb13.zip
FreeBSD-src-5d2437d56f280f49cf0e57f124f9ab98211ddb13.tar.gz
Move the call to Job_SetPrefix() to Job_Init() so that
makefiles have had a chance to set .MAKE.JOB.PREFIX
Diffstat (limited to 'contrib/bmake')
-rw-r--r--contrib/bmake/job.c1
-rw-r--r--contrib/bmake/main.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c
index 902050d..c8af895 100644
--- a/contrib/bmake/job.c
+++ b/contrib/bmake/job.c
@@ -2214,6 +2214,7 @@ Job_SetPrefix(void)
void
Job_Init(void)
{
+ Job_SetPrefix();
/* Allocate space for all the job info */
job_table = bmake_malloc(maxJobs * sizeof *job_table);
memset(job_table, 0, maxJobs * sizeof *job_table);
diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c
index 3a164ce..f4445c9 100644
--- a/contrib/bmake/main.c
+++ b/contrib/bmake/main.c
@@ -1026,7 +1026,6 @@ main(int argc, char **argv)
snprintf(pn, sizeof(pn), "%s[%d]", progname, makelevel);
progname = bmake_strdup(pn);
}
- Job_SetPrefix();
#ifdef USE_META
meta_init();
OpenPOWER on IntegriCloud