com php-src: generalize arch setup: win32/build/config.w32 win32/build/config.w32.phpize.in win32/build/confutils.js

Commit: 79c61c71c2a75e8fd41e5994f3ee774070d02bdd Author: Anatol Belski <ab@php.net> Wed, 12 Nov 2014 11:14:56 +0100 Parents: 54868c84cebec2176208319ebbdbc92b4d7ff5a3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=79c61c71c2a75e8fd41e5994f3ee774070d02bdd Log: generalize arch setup Changed paths: M win32/build/config.w32 M win32/build/config.w32.phpize.in M win32/build/confutils.js Diff: diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 65c273a..748631d 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -14,13 +14,7 @@ toolset_setup_compiler(); // do we use x64 or 80x86 version of compiler? X64 = toolset_is_64(); -if (X64) { - STDOUT.WriteLine(" Detected 64-bit compiler"); -} else { - STDOUT.WriteLine(" Detected 32-bit compiler"); -} -AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture"); -DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86'); +toolset_setup_arch(); toolset_setup_linker(); toolset_setup_project_tools(); diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 8b831f0..6a33dc2 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -14,13 +14,7 @@ toolset_setup_compiler(); // do we use x64 or 80x86 version of compiler? X64 = toolset_is_64(); -if (X64) { - STDOUT.WriteLine(" Detected 64-bit compiler"); -} else { - STDOUT.WriteLine(" Detected 32-bit compiler"); -} -AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture"); -DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86'); +toolset_setup_arch(); toolset_setup_linker(); toolset_setup_project_tools(); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1aac59e..94068bf 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2502,6 +2502,17 @@ function toolset_is_64() ERROR("Unsupported toolset"); } +function toolset_setup_arch() +{ + if (X64) { + STDOUT.WriteLine(" Detected 64-bit compiler"); + } else { + STDOUT.WriteLine(" Detected 32-bit compiler"); + } + AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture"); + DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86'); +} + function toolset_setup_linker() {