[Scummvm-git-logs] scummvm master -> 756cbd0040b9a84c1ce8b912d4dac7bbd9d5d937

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
494afab755 CONFIGURE: Don't use sub-shells when fetching compiler versions
f0097f59e9 BUILD: Differentiate Apple Clang from vanilla Clang
756cbd0040 BASE: BUILD: Differentiate Apple Clang from vanilla Clang in About dialog


Commit: 494afab755ff4998aa94c9d16561456de64a034a
    https://github.com/scummvm/scummvm/commit/494afab755ff4998aa94c9d16561456de64a034a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-06T01:27:00+02:00

Commit Message:
CONFIGURE: Don't use sub-shells when fetching compiler versions

Changed paths:
    configure


diff --git a/configure b/configure
index 4883e91e033..1b80bf67f1d 100755
--- a/configure
+++ b/configure
@@ -2411,7 +2411,7 @@ if test "$have_gcc" = yes; then
 	add_line_to_config_mk 'HAVE_GCC = 1'
 	_cxx_major=`gcc_get_define __GNUC__`
 	_cxx_minor=`gcc_get_define __GNUC_MINOR__`
-	cxx_version="`( $CXX -dumpversion ) 2>&1`"
+	cxx_version="`$CXX -dumpversion 2>&1`"
 
 	if test "$have_clang" = yes; then
 		# Clang sets a gcc version number for compatibility.
@@ -2459,13 +2459,13 @@ if test "$have_gcc" = yes; then
 		fi
 	fi
 elif test "$have_icc" = yes; then
-	cxx_version="`( $CXX -dumpversion ) 2>/dev/null`"
+	cxx_version="`$CXX -dumpversion 2>/dev/null`"
 	_cxx_major="`echo "${cxx_version}" | sed -ne 's/\([0-9][0-9]*\)\..*/\1/gp'`"
 	_cxx_minor="`echo "${cxx_version}" | sed -ne 's/[0-9][0-9]*\.\([0-9][0-9]*\)/\1/gp'`"
 	cxx_version="ICC $cxx_version, ok"
 else
 	# TODO: Big scary warning about unsupported compilers
-	cxx_version=`( $CXX -version ) 2>&1`
+	cxx_version=`$CXX -version 2>&1`
 	if test "$?" -eq 0; then
 		cxx_version="`echo "${cxx_version}" | sed -ne 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/gp'`"
 		if test -z "${cxx_version}"; then


Commit: f0097f59e9ec1cb5b2d81e652da348465f9bbad0
    https://github.com/scummvm/scummvm/commit/f0097f59e9ec1cb5b2d81e652da348465f9bbad0
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-06T01:27:00+02:00

Commit Message:
BUILD: Differentiate Apple Clang from vanilla Clang

Apple Clang has its own versioning, distinct from vanilla Clang.

Differentiate them, to avoid any ambiguity when reporting a compiler
version.  This relies on `__apple_build_version__`, as done by CMake.

Changed paths:
    configure


diff --git a/configure b/configure
index 1b80bf67f1d..ad6347c7ce4 100755
--- a/configure
+++ b/configure
@@ -2387,6 +2387,8 @@ have_icc=no
 cc_check_define __INTEL_COMPILER && have_icc=yes
 have_clang=no
 cc_check_define __clang__ && have_clang=yes
+have_apple_clang=no
+test "$have_clang" = yes && cc_check_define __apple_build_version__ && have_apple_clang=yes
 
 if test "$have_icc" = yes; then
 	add_line_to_config_mk 'HAVE_ICC = 1'
@@ -2419,10 +2421,15 @@ if test "$have_gcc" = yes; then
 		# compiler version checks.
 
 		# For the version reported in the configure log (cxx_version),
-		# we get the actual clang version.
+		# we get the actual Clang version. Apple Clang also has its
+		# own version numbers, so differentiate it.
 		cxx_version=`gcc_get_define __clang_version__`
 		cxx_version="`echo "${cxx_version}" | sed -e 's/"\([^ ]*\) .*/\1/'`"
-		cxx_version="clang $cxx_version, ok"
+		if test "$have_apple_clang" = yes; then
+			cxx_version="Apple Clang $cxx_version, ok"
+		else
+			cxx_version="Clang $cxx_version, ok"
+		fi
 
 		_clang_major=`gcc_get_define __clang_major__`
 		_clang_minor=`gcc_get_define __clang_minor__`


Commit: 756cbd0040b9a84c1ce8b912d4dac7bbd9d5d937
    https://github.com/scummvm/scummvm/commit/756cbd0040b9a84c1ce8b912d4dac7bbd9d5d937
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-06T01:27:00+02:00

Commit Message:
BASE: BUILD: Differentiate Apple Clang from vanilla Clang in About dialog

Changed paths:
    base/version.cpp


diff --git a/base/version.cpp b/base/version.cpp
index 0164dd05212..c233e7a3c5a 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -68,6 +68,9 @@ const char gScummVMCompiler[] = ""
 #elif defined(__INTEL_COMPILER)
 	"ICC " STR(__INTEL_COMPILER) "." STR(__INTEL_COMPILER_UPDATE)
 #elif defined(__clang__)
+#  if defined(__apple_build_version__)
+	"Apple "
+#  endif
 	"Clang " STR(__clang_major__) "." STR(__clang_minor__) "." STR(__clang_patchlevel__)
 #elif defined(__GNUC__)
 	"GCC " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__)