blob: 3cba3c402c27762cd451c31a5950e690602a0661 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Index: main.c
===================================================================
RCS file: /sources/make/make/main.c,v
retrieving revision 1.246
diff -u -r1.246 main.c
--- main.c 29 Aug 2010 23:05:27 -0000 1.246
+++ main.c 27 Jul 2011 22:03:12 -0000
@@ -2091,10 +2095,16 @@
/* Reset makeflags in case they were changed. */
{
+ if (master_job_slots)
+ {
+ assert (job_slots == default_job_slots);
+ job_slots = master_job_slots;
+ }
const char *pv = define_makeflags (1, 1);
char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
sprintf (p, "MAKEFLAGS=%s", pv);
putenv (allocated_variable_expand (p));
+ job_slots = default_job_slots;
}
if (ISDB (DB_BASIC))
@@ -2825,9 +2852,11 @@
&& (*(unsigned int *) cs->value_ptr ==
*(unsigned int *) cs->noarg_value))
ADD_FLAG ("", 0); /* Optional value omitted; see below. */
+#if 0
else if (cs->c == 'j')
/* Special case for `-j'. */
ADD_FLAG ("1", 1);
+#endif
else
{
char *buf = alloca (30);
|
