Skip to content

Commit 58628e0

Browse files
committed
Fix clang compiler detection on Windows
A previous commit[1] left a "debug" statement, which causes clang builds on Windows to fail always. [1] <b3d6414> Closes GH-17450.
1 parent 3c13864 commit 58628e0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ PHP NEWS
5959
. Fixed bug GH-15833 (Segmentation fault (access null pointer) in
6060
ext/spl/spl_array.c). (nielsdos)
6161

62+
- Windows:
63+
. Fixed clang compiler detection. (cmb)
64+
6265
- Zip:
6366
. Fixed bug GH-17139 (Fix zip_entry_name() crash on invalid entry).
6467
(nielsdos)

win32/build/confutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3125,7 +3125,7 @@ function toolset_get_compiler_name(short)
31253125
var command = 'cmd /c ""' + PHP_CL + '" -v"';
31263126
var full = execute(command + '" 2>&1"');
31273127

3128-
ERROR(full.split(/\n/)[0].replace(/\s/g, ' '));
3128+
return full.split(/\n/)[0].replace(/\s/g, ' ');
31293129
}
31303130

31313131
WARNING("Unsupported toolset");

0 commit comments

Comments
 (0)