diff options
| author | Anatol Belski <ab@php.net> | 2019-03-11 20:59:23 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-03-11 20:59:23 +0100 |
| commit | 95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0 (patch) | |
| tree | c50b995fc2e5e6c5b06cfe6f2e507a7cc5f70968 | |
| parent | e7ce7c6bb211011569d8036b663bc4ccd45b9984 (diff) | |
| parent | 6814ba11bc8c2638b7345aaea176fc7c678aa07f (diff) | |
| download | php-git-95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Die hard if mc.exe or mt.exe not found
| -rw-r--r-- | win32/build/confutils.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 11fc7d2ae6..82d10667bc 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3019,11 +3019,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 */ |