pyrox.dev
lol
1fix from upstream cvs
2
3----------------------------
4revision 1.247
5date: 2011-09-18 19:39:26 -0400; author: psmith; state: Exp; lines: +5 -3; commitid: 07NxO4T5PiWC82Av;
6When we re-exec the master makefile in a jobserver environment, ensure
7that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
8See Savannah bug #33873.
9
10Index: main.c
11===================================================================
12RCS file: /sources/make/make/main.c,v
13retrieving revision 1.246
14retrieving revision 1.247
15diff -u -p -r1.246 -r1.247
16--- main.c 29 Aug 2010 23:05:27 -0000 1.246
17+++ main.c 18 Sep 2011 23:39:26 -0000 1.247
18@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
19
20 ++restarts;
21
22+ /* If we're re-exec'ing the first make, put back the number of
23+ job slots so define_makefiles() will get it right. */
24+ if (master_job_slots)
25+ job_slots = master_job_slots;
26+
27 /* Reset makeflags in case they were changed. */
28 {
29 const char *pv = define_makeflags (1, 1);
30@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
31 && (*(unsigned int *) cs->value_ptr ==
32 *(unsigned int *) cs->noarg_value))
33 ADD_FLAG ("", 0); /* Optional value omitted; see below. */
34- else if (cs->c == 'j')
35- /* Special case for `-j'. */
36- ADD_FLAG ("1", 1);
37 else
38 {
39 char *buf = alloca (30);