diff options
| author | Anatol Belski <ab@php.net> | 2019-03-11 21:00:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-03-11 21:00:18 +0100 |
| commit | dbcdf857968d72a7045610dccb6da650a1a8deda (patch) | |
| tree | f8e96e18b3ca764091b70b8263a8e3136808eef6 | |
| parent | dd6911550feb1de5feed0f31b102937614df7954 (diff) | |
| parent | a526a6b4c1542f560fd9ac6bb8dbf7f5ad5efeba (diff) | |
| download | php-git-dbcdf857968d72a7045610dccb6da650a1a8deda.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
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 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 */ |