Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Die hard if mc.exe or mt.exe not found
This commit is contained in:
Anatol Belski 2019-03-11 20:59:51 +01:00
commit a526a6b4c1

View file

@ -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 */