Merge branch 'PHP-8.4'

cmb69 · cmb69 · commit 634edc8ab385 · 2025-01-14T12:36:58.000+01:00
* PHP-8.4:
  Fix clang compiler detection on Windows
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -3137,7 +3137,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");

Original file line number	Diff line number	Diff line change
`@@ -3137,7 +3137,7 @@ function toolset_get_compiler_name(short)`
`3137`	`3137`	`var command = 'cmd /c ""' + PHP_CL + '" -v"';`
`3138`	`3138`	`var full = execute(command + '" 2>&1"');`
`3139`	`3139`
`3140`		`- ERROR(full.split(/\n/)[0].replace(/\s/g, ' '));`
	`3140`	`+ return full.split(/\n/)[0].replace(/\s/g, ' ');`
`3141`	`3141`	`}`
`3142`	`3142`
`3143`	`3143`	`WARNING("Unsupported toolset");`