URL:
<http://savannah.gnu.org/bugs/?32567>
Summary: make can not compile anymore on WINDOWS32 target
from 2010-11-07
Project: make
Submitted by: cauchy
Submitted on: Tue 22 Feb 2011 02:56:56 PM CST
Severity: 3 - Normal
Item Group: Build/Install
Status: None
Privacy: Public
Assigned to: None
Open/Closed: Open
Discussion Lock: Any
Component Version: CVS
Operating System: None
Fixed Release: None
Triage Status: None
_______________________________________________________
Details:
r1.211 (2010-11-07) break the building:
----------------------------
revision 1.211
date: 2010-11-07 05:56:24 +0800; author: psmith; state: Exp; lines: +23
-9;
commitid: mcFNiET4DNlmJpVu;
Improve backslash/newline handling to adhere to POSIX requirements.
----------------------------
Here is the patch:
Index: job.c
===================================================================
RCS file: /sources/make/make/job.c,v
retrieving revision 1.211
diff -u -p -r1.211 job.c
--- job.c 6 Nov 2010 21:56:24 -0000 1.211
+++ job.c 22 Feb 2011 06:14:45 -0000
@@ -2990,7 +2990,7 @@ construct_command_argv_internal (char *l
new_argv = xmalloc(2 * sizeof (char *));
new_argv[0] = xstrdup ("");
new_argv[1] = NULL;
- } else if ((no_default_sh_exe || batch_mode_shell) && batch_filename_ptr)
{
+ } else if ((no_default_sh_exe || batch_mode_shell) && batch_filename_p)
{
int temp_fd;
FILE* batch = NULL;
int id = GetCurrentProcessId();
@@ -2998,10 +2998,10 @@ construct_command_argv_internal (char *l
/* create a file name */
sprintf(fbuf, "make%d", id);
- *batch_filename_ptr = create_batch_file (fbuf, unixy_shell, &temp_fd);
+ *batch_filename_p = create_batch_file (fbuf, unixy_shell, &temp_fd);
DB (DB_JOBS, (_("Creating temporary batch file %s\n"),
- *batch_filename_ptr));
+ *batch_filename_p));
/* Create a FILE object for the batch file, and write to it the
commands to be executed. Put the batch file in TEXT mode. */
@@ -3019,9 +3019,9 @@ construct_command_argv_internal (char *l
new_argv = xmalloc(3 * sizeof (char *));
if (unixy_shell) {
new_argv[0] = xstrdup (shell);
- new_argv[1] = *batch_filename_ptr; /* only argv[0] gets freed later
*/
+ new_argv[1] = *batch_filename_p; /* only argv[0] gets freed later */
} else {
- new_argv[0] = xstrdup (*batch_filename_ptr);
+ new_argv[0] = xstrdup (*batch_filename_p);
new_argv[1] = NULL;
}
new_argv[2] = NULL;
_______________________________________________________
File Attachments:
-------------------------------------------------------
Date: Tue 22 Feb 2011 02:56:56 PM CST Name: job.c.patch Size: 2kB By:
cauchy
<http://savannah.gnu.org/bugs/download.php?file_id=22751>
_______________________________________________________
Reply to this item at:
<http://savannah.gnu.org/bugs/?32567>
_______________________________________________
Message sent via/by Savannah
http://savannah.gnu.org/
_______________________________________________
Bug-make mailing list
Bug-make@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-make
