Skip to content

Commit 5a6f3de

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #79146: cscript can fail to run on some systems
2 parents a9aee3d + b0f8d38 commit 5a6f3de

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

buildconf.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
2-
cscript /nologo win32\build\buildconf.js %*
2+
cscript /nologo /e:jscript win32\build\buildconf.js %*
33
SET PHP_BUILDCONF_PATH=%~dp0
44
copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
55
SET PHP_SDK_SCRIPT_PATH=

win32/build/buildconf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,4 +256,4 @@ C.WriteBlankLines(1);
256256
C.Write(file_get_contents("win32/build/configure.tail"));
257257

258258
B.WriteLine("@echo off");
259-
B.WriteLine("cscript /nologo configure.js %*");
259+
B.WriteLine("cscript /nologo /e:jscript configure.js %*");

win32/build/configure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
cscript /nologo configure.js %*
2+
cscript /nologo /e:jscript configure.js %*

win32/build/confutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ function conf_process_args()
319319
var i, j;
320320
var configure_help_mode = false;
321321
var analyzed = false;
322-
var nice = "cscript /nologo configure.js ";
322+
var nice = "cscript /nologo /e:jscript configure.js ";
323323
var disable_all = false;
324324

325325
args = WScript.Arguments;

win32/build/phpize.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
SET PHP_BUILDCONF_PATH=%~dp0
3-
cscript /nologo %PHP_BUILDCONF_PATH%\script\phpize.js %*
3+
cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %*
44
IF NOT EXIST configure.bat (
55
echo Error generating configure script, configure script was not copied
66
exit /b 3

win32/build/phpize.js.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,6 @@ C.WriteBlankLines(1);
258258
C.Write(file_get_contents(PHP_DIR + "\\script\\configure.tail"));
259259

260260
B.WriteLine("@echo off");
261-
B.WriteLine("cscript /nologo configure.js %*");
261+
B.WriteLine("cscript /nologo /e:jscript configure.js %*");
262262

263263
FSO.CopyFile(PHP_DIR + "\\script\\run-tests.php", "run-tests.php", true);

0 commit comments

Comments
 (0)