Skip to content

Commit d845e50

Browse files
authored
Fix python search path in emsdk launcher scripts (#1571)
The `-0` and `-1` suffixes here are not part of the install path which only based on the `id` and `version` of the tool. e.g: ``` { "id": "python", "version": "3.9.2", "bitness": 64, "arch": "x86_64", "windows_url": "python-3.9.2-1-embed-amd64+pywin32.zip", "activated_cfg": "PYTHON='%installation_dir%/python.exe'", "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe" }, ``` Here we have a `-1` in the archive name, but that is not included in the version which is used to construct the install path. Fixes: #1570
1 parent 62a853c commit d845e50

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

emsdk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
# First look for python bundled in Emsdk
1010
if [ -z "$EMSDK_PYTHON" ]; then
11-
PYTHON3="$(dirname "$0")/python/3.13.3-0_64bit/bin/python3"
11+
PYTHON3="$(dirname "$0")/python/3.13.3_64bit/bin/python3"
1212
if [ ! -f "$PYTHON3" ]; then
13-
PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3"
13+
PYTHON3="$(dirname "$0")/python/3.9.2_64bit/bin/python3"
1414
fi
1515
if [ -f "$PYTHON3" ]; then
1616
EMSDK_PYTHON="$PYTHON3"

emsdk.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ setlocal
88
:: PYTHONHOME or PYTHONPATH
99
:: https://github.com/emscripten-core/emsdk/issues/598
1010

11-
if exist "%~dp0python\3.13.3-0_64bit\python.exe" (
12-
set EMSDK_PY="%~dp0python\3.13.3-0_64bit\python.exe"
11+
if exist "%~dp0python\3.13.3_64bit\python.exe" (
12+
set EMSDK_PY="%~dp0python\3.13.3_64bit\python.exe"
1313
set PYTHONHOME=
1414
set PYTHONPATH=
1515
goto end
1616
)
1717

18-
if exist "%~dp0python\3.9.2-1_64bit\python.exe" (
19-
set EMSDK_PY="%~dp0python\3.9.2-1_64bit\python.exe"
18+
if exist "%~dp0python\3.9.2_64bit\python.exe" (
19+
set EMSDK_PY="%~dp0python\3.9.2_64bit\python.exe"
2020
set PYTHONHOME=
2121
set PYTHONPATH=
2222
goto end

0 commit comments

Comments
 (0)