Skip to content

Commit 95c8f67

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Die hard if mc.exe or mt.exe not found
2 parents e7ce7c6 + 6814ba1 commit 95c8f67

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

win32/build/confutils.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3019,11 +3019,15 @@ function toolset_setup_project_tools()
30193019
PATH_PROG('7za');
30203020

30213021
// avoid picking up midnight commander from cygwin
3022-
PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
3022+
if (!PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"))) {
3023+
ERROR('mc is required')
3024+
}
30233025

30243026
// Try locating the manifest tool
30253027
if (VS_TOOLSET) {
3026-
PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"));
3028+
if (!PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"))) {
3029+
ERROR('mt is required')
3030+
}
30273031
}
30283032
}
30293033
/* Get compiler if the toolset is supported */

0 commit comments

Comments
 (0)