diff options
| author | Anatol Belski <ab@php.net> | 2014-11-12 11:14:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-12 17:57:16 +0100 |
| commit | 79c61c71c2a75e8fd41e5994f3ee774070d02bdd (patch) | |
| tree | a32553c8aa3c0824f2e496348297bca0ed519351 /win32 | |
| parent | 54868c84cebec2176208319ebbdbc92b4d7ff5a3 (diff) | |
| download | php-git-79c61c71c2a75e8fd41e5994f3ee774070d02bdd.tar.gz | |
generalize arch setup
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 8 | ||||
| -rw-r--r-- | win32/build/config.w32.phpize.in | 8 | ||||
| -rw-r--r-- | win32/build/confutils.js | 11 |
3 files changed, 13 insertions, 14 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 65c273a5bc..748631ddde 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 8b831f0b10..6a33dc2036 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 1aac59ea5f..94068bfa9d 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() { |