Skip to content

Commit

Permalink
Fix ASAN configuration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
cmb69 committed Apr 6, 2019
1 parent 1b85e72 commit 3393ae6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions win32/build/confutils.js
Expand Up @@ -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);

Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 3393ae6

Please sign in to comment.