diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-28 08:33:09 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-01-04 10:13:54 +0100 |
| commit | 9bf43c45908433d382f0499d529849172d0d8206 (patch) | |
| tree | 3819cdc074b50652240f3a7ec0b5976f989bd5b7 /win32 | |
| parent | b30462beadc60abaa983acd6613b5c83994f435e (diff) | |
| download | php-git-9bf43c45908433d382f0499d529849172d0d8206.tar.gz | |
rename COMPILER and ARCHITECTURE macro (too generic)
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 31314ffd95..19fbd52aa9 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2944,25 +2944,25 @@ function toolset_setup_compiler() WARNING("Using unknown MSVC version " + tmp); - AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); + AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); DEFINE("PHP_COMPILER_SHORT", tmp); AC_DEFINE('PHP_COMPILER_ID', tmp, "Compiler compatibility ID"); } else { - AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); + AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); DEFINE("PHP_COMPILER_SHORT", COMPILER_NAME_SHORT.toLowerCase()); AC_DEFINE('PHP_COMPILER_ID', COMPILER_NAME_SHORT.toUpperCase(), "Compiler compatibility ID"); } } else if (CLANG_TOOLSET) { CLANGVERS = COMPILER_NUMERIC_VERSION; - AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); + AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); DEFINE("PHP_COMPILER_SHORT", "clang"); AC_DEFINE('PHP_COMPILER_ID', "clang"); /* XXX something better were to write here */ } else if (ICC_TOOLSET) { INTELVERS = COMPILER_NUMERIC_VERSION; - AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); + AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version"); DEFINE("PHP_COMPILER_SHORT", "icc"); AC_DEFINE('PHP_COMPILER_ID', "icc"); /* XXX something better were to write here */ } @@ -3162,7 +3162,7 @@ function toolset_setup_arch() } else { STDOUT.WriteLine(" Detected 32-bit compiler"); } - AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture"); + AC_DEFINE('PHP_BUILD_ARCH', X64 ? 'x64' : 'x86', "Detected compiler architecture"); DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86'); } |