https://github.com/python/cpython/commit/61c1a2478e6da8dc6dbdce4d6ac66b03d5963710
commit: 61c1a2478e6da8dc6dbdce4d6ac66b03d5963710
branch: main
author: Hood Chatham <roberthoodchat...@gmail.com>
committer: freakboy3742 <russ...@keith-magee.com>
date: 2025-01-07T06:26:35+08:00
summary:

gh-127146: Strip dash from Emscripten compiler version (#128557)

`emcc -dumpversion` will sometimes say e.g., `4.0.0-git` but in this case
uname does not include `-git` in the version string. Use cut to delete
everything after the dash.

files:
M configure
M configure.ac

diff --git a/configure b/configure
index 61ee51c4b36473..9024d22d4df5cd 100755
--- a/configure
+++ b/configure
@@ -4595,7 +4595,7 @@ printf "%s\n" "$IPHONEOS_DEPLOYMENT_TARGET" >&6; }
                _host_ident=$host_cpu
                ;;
        *-*-emscripten)
-               _host_ident=$(emcc -dumpversion)-$host_cpu
+               _host_ident=$(emcc -dumpversion | cut -f1 -d-)-$host_cpu
                ;;
        wasm32-*-* | wasm64-*-*)
                _host_ident=$host_cpu
diff --git a/configure.ac b/configure.ac
index 172e8a1a842010..86775e03e73d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -794,7 +794,7 @@ if test "$cross_compiling" = yes; then
                _host_ident=$host_cpu
                ;;
        *-*-emscripten)
-               _host_ident=$(emcc -dumpversion)-$host_cpu
+               _host_ident=$(emcc -dumpversion | cut -f1 -d-)-$host_cpu
                ;;
        wasm32-*-* | wasm64-*-*)
                _host_ident=$host_cpu

_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com

Reply via email to