]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorAnatol Belski <ab@php.net>
Mon, 11 Mar 2019 19:59:23 +0000 (20:59 +0100)
committerAnatol Belski <ab@php.net>
Mon, 11 Mar 2019 19:59:23 +0000 (20:59 +0100)
* PHP-7.2:
  Die hard if mc.exe or mt.exe not found

1  2 
win32/build/confutils.js

index 11fc7d2ae6a412df2e7c42467746eab8dfa246cc,d943453bf8e59e9dc4f2453f2dabf2f57e8e2b8c..82d10667bc896eafe2209f8af0d33f5565848a85
@@@ -3016,10 -2934,11 +3016,12 @@@ function toolset_setup_project_tools(
        }
        PATH_PROG('zip');
        PATH_PROG('lemon');
 +      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) {