[x264-devel] [Git][videolan/x264][master] configure: Use MSYSTEM_CARCH for default arch on msys2

[Martin Storsjö (@mstorsjo)]

Martin Storsjö pushed to branch master at VideoLAN / x264


Commits:
ff620d0c by Coia Prant at 2025-05-27T19:44:39+00:00
configure: Use MSYSTEM_CARCH for default arch on msys2

- - - - -


1 changed file:

- config.guess


Changes:

=====================================
config.guess
=====================================
@@ -138,6 +138,13 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+# msys2 always reports `uname -m` as `x86_64`
+# but `$MSYSTEM_CARCH` reports the real toolchain target architecture of the msys2 environment
+# Link: https://github.com/msys2/msys2-runtime/issues/171
+if test "$MSYSTEM_CARCH" != ""; then
+	UNAME_MACHINE="$MSYSTEM_CARCH"
+fi
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in



View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/ff620d0c3c4f717ab393892983d43458d27e4bed

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/ff620d0c3c4f717ab393892983d43458d27e4bed
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance