| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Mon, 11 Mar 2013 10:38:09 -0700 | |
| branch | s11-update |
| changeset 2520 | ceec631e74d1 |
| parent 770 | f112e7923000 |
| permissions | -rw-r--r-- |
|
770
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
1 |
This patch is taken from: |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
2 |
http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.243&r2=1.244 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
3 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
4 |
Fix Savannah bug #30723: |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
5 |
expand MAKEFLAGS before we re-exec after rebuilding makefiles. |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
6 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
7 |
bug #30723: implicit re-executing of subdirs breaks $(origin) with make-3.82 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
8 |
https://savannah.gnu.org/bugs/?30723 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
9 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
10 |
--- a/main.c 2010/07/19 07:10:53 1.243 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
11 |
+++ b/main.c 2010/08/10 07:35:34 1.244 |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
12 |
@@ -2093,7 +2093,7 @@ |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
13 |
const char *pv = define_makeflags (1, 1); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
14 |
char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
15 |
sprintf (p, "MAKEFLAGS=%s", pv); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
16 |
- putenv (p); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
17 |
+ putenv (allocated_variable_expand (p)); |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
18 |
} |
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
19 |
|
|
f112e7923000
7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
20 |
if (ISDB (DB_BASIC)) |