Skip to content

Commit 95e5283

Browse files
committed
Revert "do not expose a cache_tag, until we can properly (de)serialize code"
This reverts commit 9861aa8fefbb4123623abcf1a3e3a961f86ef519.
1 parent 44c91a8 commit 95e5283

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ Object run(
462462
static String getSoAbi(PythonContext ctxt) {
463463
PythonModule sysModule = ctxt.getCore().lookupBuiltinModule("sys");
464464
Object implementationObj = ReadAttributeFromObjectNode.getUncached().execute(sysModule, "implementation");
465-
// sys.implementation.name
466-
String implName = (String) PInteropGetAttributeNode.getUncached().execute(implementationObj, "name");
465+
// sys.implementation.cache_tag
466+
String cacheTag = (String) PInteropGetAttributeNode.getUncached().execute(implementationObj, "cache_tag");
467467
// sys.implementation._multiarch
468468
String multiArch = (String) PInteropGetAttributeNode.getUncached().execute(implementationObj, "_multiarch");
469469

@@ -480,7 +480,7 @@ static String getSoAbi(PythonContext ctxt) {
480480
soExt = ".so";
481481
}
482482

483-
return "." + implName + "-" + toolchainId + "-" + multiArch + soExt;
483+
return "." + cacheTag + "-" + toolchainId + "-" + multiArch + soExt;
484484
}
485485
}
486486

graalpython/lib-graalpython/sys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def make_implementation_info():
4444
)
4545
return SimpleNamespace(
4646
name="graalpython",
47-
cache_tag=None,
47+
cache_tag="graalpython",
4848
version=version_info_type(version_info),
4949
_multiarch=__gmultiarch
5050
)

graalpython/lib-python/3/distutils/sysconfig_graalpython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _init_posix():
6565
darwin_native = sys.platform == "darwin" and __graalpython__.platform_id == "native"
6666

6767
# note: this must be kept in sync with _imp.extension_suffixes
68-
so_abi = sys.implementation.name + "-" + __graalpython__.platform_id + "-" + sys.implementation._multiarch
68+
so_abi = sys.implementation.cache_tag + "-" + __graalpython__.platform_id + "-" + sys.implementation._multiarch
6969
so_ext = ".so" if not darwin_native else ".dylib"
7070
assert _imp.extension_suffixes()[0] == "." + so_abi + so_ext, "mismatch between extension suffix to _imp.extension_suffixes"
7171

0 commit comments

Comments
 (0)