From 58628e0cc629338fa43fb175f733778432346a86 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 12 Jan 2025 16:40:59 +0100 Subject: [PATCH] Fix clang compiler detection on Windows A previous commit[1] left a "debug" statement, which causes clang builds on Windows to fail always. [1] Closes GH-17450. --- NEWS | 3 +++ win32/build/confutils.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index aa950bd5c16..a7cf2ebd6f4 100644 --- a/NEWS +++ b/NEWS @@ -59,6 +59,9 @@ PHP NEWS . Fixed bug GH-15833 (Segmentation fault (access null pointer) in ext/spl/spl_array.c). (nielsdos) +- Windows: + . Fixed clang compiler detection. (cmb) + - Zip: . Fixed bug GH-17139 (Fix zip_entry_name() crash on invalid entry). (nielsdos) diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1a4ddbffaa9..add581aa640 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3125,7 +3125,7 @@ function toolset_get_compiler_name(short) var command = 'cmd /c ""' + PHP_CL + '" -v"'; var full = execute(command + '" 2>&1"'); - ERROR(full.split(/\n/)[0].replace(/\s/g, ' ')); + return full.split(/\n/)[0].replace(/\s/g, ' '); } WARNING("Unsupported toolset");