Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Move the call to Job_SetPrefix() to Job_Init() ...



details:   https://anonhg.NetBSD.org/src/rev/c76dd015e517
branches:  trunk
changeset: 789027:c76dd015e517
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sun Aug 04 16:48:15 2013 +0000

description:
Move the call to Job_SetPrefix() to Job_Init() so that
makefiles have had a chance to set .MAKE.JOB.PREFIX

diffstat:

 usr.bin/make/job.c  |  7 ++++---
 usr.bin/make/main.c |  7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 8182669da8fa -r c76dd015e517 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Aug 04 11:09:55 2013 +0000
+++ b/usr.bin/make/job.c        Sun Aug 04 16:48:15 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $    */
+/*     $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg 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.175 2013/07/30 19:09:57 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg 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.175 2013/07/30 19:09:57 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2198,6 +2198,7 @@
 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 -r 8182669da8fa -r c76dd015e517 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sun Aug 04 11:09:55 2013 +0000
+++ b/usr.bin/make/main.c       Sun Aug 04 16:48:15 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $   */
+/*     $NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.223 2013/08/04 16:48:15 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -995,7 +995,6 @@
                snprintf(pn, sizeof(pn), "%s[%d]", progname, makelevel);
                progname = bmake_strdup(pn);
        }
-       Job_SetPrefix();
 
 #ifdef USE_META
        meta_init();



Home | Main Index | Thread Index | Old Index