Skip to content

Commit 92a4317

Browse files
author
Chongkai Zhu
committed
use a trick to get_config_var as before
1 parent 313279e commit 92a4317

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

cpython-unix/build-cpython.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,8 +901,15 @@ FREETHREADED = sysconfig.get_config_var("Py_GIL_DISABLED")
901901
MAJMIN = ".".join([str(sys.version_info[0]), str(sys.version_info[1])])
902902
LIB_SUFFIX = "t" if FREETHREADED else ""
903903
PYTHON_CONFIG = os.path.join(ROOT, "install", "bin", "python%s-config" % MAJMIN)
904-
PLATFORM_CONFIG = sysconfig.get_config_var("LIBPL")
905-
MAKEFILE = os.path.join(PLATFORM_CONFIG, "Makefile")
904+
PLATFORM_CONFIG = sysconfig.get_config_var("LIBPL").split("lib/python%s%s" % (MAJMIN, LIB_SUFFIX), 1)[1].lstrip('/')
905+
MAKEFILE = os.path.join(
906+
ROOT,
907+
"install",
908+
"lib",
909+
"python%s%s" % (MAJMIN, LIB_SUFFIX),
910+
PLATFORM_CONFIG,
911+
"Makefile",
912+
)
906913
SYSCONFIGDATA = os.path.join(
907914
ROOT,
908915
"install",
@@ -1056,6 +1063,7 @@ extension_suffixes.append(".abi3.so")
10561063
10571064
extension_suffixes.append(".so")
10581065
1066+
PLATFORM_CONFIG = sysconfig.get_config_var("LIBPL").split("lib/python%s%s" % (sysconfig.get_python_version(), sys.abiflags), 1)[1].lstrip('/')
10591067
metadata = {
10601068
"python_abi_tag": sys.abiflags,
10611069
"python_implementation_cache_tag": sys.implementation.cache_tag,
@@ -1075,7 +1083,8 @@ metadata = {
10751083
"python_paths_abstract": sysconfig.get_paths(expand=False),
10761084
"python_exe": "install/bin/python%s%s" % (sysconfig.get_python_version(), sys.abiflags),
10771085
"python_major_minor_version": sysconfig.get_python_version(),
1078-
"python_stdlib_platform_config": sysconfig.get_config_var("LIBPL"),
1086+
"python_stdlib_platform_config": "install/lib/python%s%s/%s" % (sysconfig.get_python_version(), sys.abiflags, PLATFORM_CONFIG)
1087+
sysconfig.get_config_var("LIBPL").lstrip("/"),
10791088
"python_config_vars": {k: str(v) for k, v in sysconfig.get_config_vars().items()},
10801089
}
10811090

cpython-unix/build.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,8 @@ def python_build_info(
682682
}
683683

684684
if info.get("build-mode") == "shared":
685-
shared_dir = extra_metadata["python_config_vars"]["DESTSHARED"].strip("/")
685+
shared_dir = extra_metadata["python_config_vars"]["DESTSHARED"]
686+
shared_dir = shared_dir[shared_dir.find("install") :]
686687
extension_suffix = extra_metadata["python_config_vars"]["EXT_SUFFIX"]
687688
entry["shared_lib"] = "%s/%s%s" % (shared_dir, extension, extension_suffix)
688689

0 commit comments

Comments
 (0)