com php-src: Fix ASAN configuration: win32/build/confutils.js
| From: | Christoph Michael Becker | Date: | Sat, 06 Apr 2019 15:38:18 +0000 |
| Subject: | com php-src: Fix ASAN configuration: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105542@lists.php.net to get a copy of this message | ||
Commit: 3393ae6e77c485c3ac69a11287432eee3088cd76
Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 6 Apr 2019 17:38:18 +0200
Parents: 1b85e72032ecf912f6fc50d0704662dfa2cb0292
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3393ae6e77c485c3ac69a11287432eee3088cd76
Log:
Fix ASAN configuration
Commit 6a624c1[1] mostly replaced
COMPILER_NAME with
COMPILER_NAME_LONG and COMPILER_NAME_SHORT, but not all
occurrences, what broke the Clang ASAN configuration. We fix this by
getting rid of COMPILER_NAME altogether.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=6a624c1dfda0dbfaaff3e453e6cb58de12748fb3>
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 7a33ce6..f43572c 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2940,7 +2940,7 @@ function toolset_setup_compiler()
if ("unknown" == COMPILER_NAME_LONG) {
var tmp = probe_binary(PHP_CL);
- COMPILER_NAME = "MSVC " + tmp + ", untested";
+ COMPILER_NAME_LONG = COMPILER_NAME_SHORT = "MSVC " + tmp + ", untested";
WARNING("Using unknown MSVC version " + tmp);
@@ -3652,7 +3652,7 @@ function get_clang_lib_dir()
var ret = null;
var ver = null;
- if (COMPILER_NAME.match(/clang version ([\d\.]+) \((.*)\)/)) {
+ if (COMPILER_NAME_LONG.match(/clang version ([\d\.]+) \((.*)\)/)) {
ver = RegExp.$1;
} else {
ERROR("Faled to determine clang lib path");
@@ -3685,7 +3685,7 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name)
var ver = null;
- if (COMPILER_NAME.match(/clang version ([\d\.]+) \((.*)\)/)) {
+ if (COMPILER_NAME_LONG.match(/clang version ([\d\.]+) \((.*)\)/)) {
ver = RegExp.$1;
} else {
ERROR("Faled to determine clang lib path");