archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  don't fail miserably, when an unknown vc version is used
This commit is contained in:
Anatol Belski 2016-11-18 18:21:28 +01:00
commit 828f866e47
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
win32/build/confutils.js
View file

@ -2795,9 +2795,20 @@ function toolset_setup_compiler()
ERROR("Unsupported MS C++ Compiler, VC11 (2011) minimum is required"); ERROR("Unsupported MS C++ Compiler, VC11 (2011) minimum is required");
} }
AC_DEFINE('COMPILER', COMPILER_NAME, "Detected compiler version"); if (undefined == COMPILER_NAME) {
DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]); var tmp = probe_binary(PHP_CL);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID"); COMPILER_NAME = "MSVC " + tmp + ", untested";
WARNING("Using unknown MSVC version " + tmp);
AC_DEFINE('COMPILER', COMPILER_NAME, "Detected compiler version");
DEFINE("PHP_COMPILER_SHORT", tmp);
AC_DEFINE('PHP_COMPILER_ID', tmp, "Compiler compatibility ID");
} else {
AC_DEFINE('COMPILER', COMPILER_NAME, "Detected compiler version");
DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID");
}
} else if (CLANG_TOOLSET) { } else if (CLANG_TOOLSET) {
CLANGVERS = COMPILER_NUMERIC_VERSION; CLANGVERS = COMPILER_NUMERIC_VERSION;
@ -2917,8 +2928,15 @@ function toolset_get_compiler_name()
var version; var version;
if (VS_TOOLSET) { if (VS_TOOLSET) {
var name = undefined;
version = probe_binary(PHP_CL).substr(0, 5).replace('.', ''); version = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
return VC_VERSIONS[version];
if (undefined != VC_VERSIONS[version]) {
name = VC_VERSIONS[version];
}
return name;
} else if (CLANG_TOOLSET || ICC_TOOLSET) { } else if (CLANG_TOOLSET || ICC_TOOLSET) {
var command = 'cmd /c ""' + PHP_CL + '" -v"'; var command = 'cmd /c ""' + PHP_CL + '" -v"';
var full = execute(command + '" 2>&1"'); var full = execute(command + '" 2>&1"');