Contents of /trunk/make/patches/make-3.82-makeflags.patch
Parent Directory | Revision Log
Revision 2179 -
(show annotations)
(download)
Wed May 22 12:31:00 2013 UTC (11 years, 4 months ago) by niro
File size: 1163 byte(s)
Wed May 22 12:31:00 2013 UTC (11 years, 4 months ago) by niro
File size: 1163 byte(s)
-more patches from upstream
1 | Index: main.c |
2 | =================================================================== |
3 | RCS file: /sources/make/make/main.c,v |
4 | retrieving revision 1.246 |
5 | diff -u -r1.246 main.c |
6 | --- main.c 29 Aug 2010 23:05:27 -0000 1.246 |
7 | +++ main.c 27 Jul 2011 22:03:12 -0000 |
8 | @@ -2091,10 +2095,16 @@ |
9 | |
10 | /* Reset makeflags in case they were changed. */ |
11 | { |
12 | + if (master_job_slots) |
13 | + { |
14 | + assert (job_slots == default_job_slots); |
15 | + job_slots = master_job_slots; |
16 | + } |
17 | const char *pv = define_makeflags (1, 1); |
18 | char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); |
19 | sprintf (p, "MAKEFLAGS=%s", pv); |
20 | putenv (allocated_variable_expand (p)); |
21 | + job_slots = default_job_slots; |
22 | } |
23 | |
24 | if (ISDB (DB_BASIC)) |
25 | @@ -2825,9 +2852,11 @@ |
26 | && (*(unsigned int *) cs->value_ptr == |
27 | *(unsigned int *) cs->noarg_value)) |
28 | ADD_FLAG ("", 0); /* Optional value omitted; see below. */ |
29 | +#if 0 |
30 | else if (cs->c == 'j') |
31 | /* Special case for `-j'. */ |
32 | ADD_FLAG ("1", 1); |
33 | +#endif |
34 | else |
35 | { |
36 | char *buf = alloca (30); |