From bef7097ef4053a341e92ef71eb0a52d8b696fae2 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Mon, 1 Sep 2025 00:50:29 +0200 Subject: [PATCH] gh-138130: Fix return value of libc_ver() on Emscripten (GH-138132) Emscripten's libc is a hybrid of musl and llvm libc; but it reports that it is "glibc". This modifies the return value of `platform.libc_ver()` to return something that is Emscripten-specific. (cherry picked from commit 11a5fc82381308f0b6060b8c06af89fd197516e1) Co-authored-by: Hood Chatham --- Lib/platform.py | 5 +++++ Lib/test/test_platform.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py index 7dd64de6025d2d..c14a97811d1143 100644 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -173,6 +173,11 @@ def libc_ver(executable=None, lib='', version='', chunksize=16384): """ if not executable: + if sys.platform == "emscripten": + # Emscripten's os.confstr reports that it is glibc, so special case + # it. + ver = ".".join(str(x) for x in sys._emscripten_info.emscripten_version) + return ("emscripten", ver) try: ver = os.confstr('CS_GNU_LIBC_VERSION') # parse 'glibc 2.28' as ('glibc', '2.28') diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 719c4feace6544..6f882a2ca003ea 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -525,8 +525,10 @@ def test_ios_ver(self): self.assertEqual(override.model, "Whiz") self.assertTrue(override.is_simulator) - @unittest.skipIf(support.is_emscripten, "Does not apply to Emscripten") def test_libc_ver(self): + if support.is_emscripten: + assert platform.libc_ver() == ("emscripten", "4.0.12") + return # check that libc_ver(executable) doesn't raise an exception if os.path.isdir(sys.executable) and \ os.path.exists(sys.executable+'.exe'):