Skip to content

Commit dbcdf85

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Die hard if mc.exe or mt.exe not found
2 parents dd69115 + a526a6b commit dbcdf85

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
@@ -3044,11 +3044,15 @@ function toolset_setup_project_tools()
30443044
PATH_PROG('7za');
30453045

30463046
// avoid picking up midnight commander from cygwin
3047-
PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
3047+
if (!PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"))) {
3048+
ERROR('mc is required')
3049+
}
30483050

30493051
// Try locating the manifest tool
30503052
if (VS_TOOLSET) {
3051-
PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"));
3053+
if (!PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"))) {
3054+
ERROR('mt is required')
3055+
}
30523056
}
30533057
}
30543058
/* Get compiler if the toolset is supported */

0 commit comments

Comments
 (0)