From: Hood Chatham Date: Sun, 31 Aug 2025 22:50:29 +0000 (+0200) Subject: gh-138130: Fix return value of libc_ver() on Emscripten (#138132) X-Git-Tag: v3.15.0a1~557 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11a5fc82381308f0b6060b8c06af89fd197516e1;p=thirdparty%2FPython%2Fcpython.git gh-138130: Fix return value of libc_ver() on Emscripten (#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. --- diff --git a/Lib/platform.py b/Lib/platform.py index da15bb4717bb..762f5d06099c 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 2e26134bae83..73d4f3cbdb68 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -532,8 +532,10 @@ class PlatformTest(unittest.TestCase): 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'):