summaryrefslogtreecommitdiff
path: root/win32/build
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2019-03-11 20:59:51 +0100
committerAnatol Belski <ab@php.net>2019-03-11 20:59:51 +0100
commita526a6b4c1542f560fd9ac6bb8dbf7f5ad5efeba (patch)
tree99e805e48c91e0c835df3489068a9728d2545422 /win32/build
parentaefe0dfd61fa8b1f7e32eaa688f81a76a6956649 (diff)
parent95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0 (diff)
downloadphp-git-a526a6b4c1542f560fd9ac6bb8dbf7f5ad5efeba.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Die hard if mc.exe or mt.exe not found
Diffstat (limited to 'win32/build')
-rw-r--r--win32/build/confutils.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index bf1a4b7ccc..2860844650 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3044,11 +3044,15 @@ function toolset_setup_project_tools()
PATH_PROG('7za');
// avoid picking up midnight commander from cygwin
- PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
+ if (!PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"))) {
+ ERROR('mc is required')
+ }
// Try locating the manifest tool
if (VS_TOOLSET) {
- PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"));
+ if (!PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"))) {
+ ERROR('mt is required')
+ }
}
}
/* Get compiler if the toolset is supported */