com php-src: --with-mp is only available for VS anyway, so don't make the argument available if it doesn't have any effect: win32/build/config.w32

Commit: a8b6d50da4c7fb254ef4eb6d8ea7425778cf3f3e Author: Kalle Sommer Nielsen <kalle@php.net> Sat, 22 Jul 2017 23:54:15 +0200 Parents: e0825ec60fc4e4aa3f026c832c26be51b23b4f09 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8b6d50da4c7fb254ef4eb6d8ea7425778cf3f3e Log: --with-mp is only available for VS anyway, so don't make the argument available if it doesn't have any effect Changed paths: M win32/build/config.w32 Diff: diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 43b0362..6cbb18b 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -60,29 +60,32 @@ DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM /I ext "); toolset_setup_common_cflags(); -ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto'); -var PHP_MP_DISABLED = true; -if (VS_TOOLSET && PHP_MP != 'disable') { - if(PHP_DEBUG == 'yes') { - STDOUT.WriteLine('WARNING: Debug builds cannot be built using multi processing'); - } else { - // no from disable-all - if(PHP_MP == 'auto' || PHP_MP == 'no') { - ADD_FLAG('CFLAGS', ' /MP '); - PHP_MP_DISABLED = false; +if (VS_TOOLSET) { + ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto'); + var PHP_MP_DISABLED = true; + + if (PHP_MP != 'disable') { + if(PHP_DEBUG == 'yes') { + STDOUT.WriteLine('WARNING: Debug builds cannot be built using multi processing'); } else { - if(parseInt(PHP_MP) != 0) { - ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' '); + // no from disable-all + if(PHP_MP == 'auto' || PHP_MP == 'no') { + ADD_FLAG('CFLAGS', ' /MP '); PHP_MP_DISABLED = false; } else { - STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP); + if(parseInt(PHP_MP) != 0) { + ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' '); + PHP_MP_DISABLED = false; + } else { + STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP); + } } } } -} -if (!PHP_MP_DISABLED) { - STDOUT.WriteLine('Enabling multi process build'); + if (!PHP_MP_DISABLED) { + STDOUT..WriteLine('Enabling multi process build'); + } } // General link flags