Skip to content

Commit a927601

Browse files
committed
Fix the generated data for Windows
1 parent 8d58be4 commit a927601

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ gmon.out
4545
.pytest_cache/
4646
.ruff_cache/
4747
.DS_Store
48+
__install__.json
49+
build-details.json
4850

4951
*.exe
5052

Tools/build/generate_build_details.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,15 @@ def generate_data(
6868

6969
data['base_prefix'] = sysconfig.get_config_var('installed_base')
7070
#data['base_interpreter'] = sys._base_executable
71-
data['base_interpreter'] = os.path.join(
72-
sysconfig.get_path('scripts'),
73-
'python' + sysconfig.get_config_var('VERSION'),
74-
)
71+
if os.name == 'nt':
72+
data['base_interpreter'] = os.path.join(
73+
data['base_prefix'], os.path.basename(sys._base_executable)
74+
)
75+
else:
76+
data['base_interpreter'] = os.path.join(
77+
sysconfig.get_path('scripts'),
78+
'python' + sysconfig.get_config_var('VERSION'),
79+
)
7580
data['platform'] = sysconfig.get_platform()
7681

7782
data['language']['version'] = sysconfig.get_python_version()
@@ -94,13 +99,19 @@ def generate_data(
9499
#data['suffixes']['debug_bytecode'] = importlib.machinery.DEBUG_BYTECODE_SUFFIXES
95100
data['suffixes']['extensions'] = importlib.machinery.EXTENSION_SUFFIXES
96101

97-
LIBDIR = sysconfig.get_config_var('LIBDIR')
102+
if os.name == 'nt':
103+
LIBDIR = data['base_prefix']
104+
else:
105+
LIBDIR = sysconfig.get_config_var('LIBDIR')
98106
LDLIBRARY = sysconfig.get_config_var('LDLIBRARY')
99107
LIBRARY = sysconfig.get_config_var('LIBRARY')
100108
PY3LIBRARY = sysconfig.get_config_var('PY3LIBRARY')
101109
LIBPYTHON = sysconfig.get_config_var('LIBPYTHON')
102110
LIBPC = sysconfig.get_config_var('LIBPC')
103-
INCLUDEPY = sysconfig.get_config_var('INCLUDEPY')
111+
if os.name == 'nt':
112+
INCLUDEPY = os.path.join(data['base_prefix'], 'include')
113+
else:
114+
INCLUDEPY = sysconfig.get_config_var('INCLUDEPY')
104115

105116
if os.name == 'posix':
106117
# On POSIX, LIBRARY is always the static library, while LDLIBRARY is the

0 commit comments

Comments
 (0)