Skip to content

Commit 42d6358

Browse files
committed
3.1.72.1
1 parent 17c90c5 commit 42d6358

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export EMSDK_NUM_CORES=1
6767

6868
# for shared modules
6969
export PYDK_PYTHON_HOST_PLATFORM=wasm32-${WASM_FLAVOUR}-emscripten
70+
export PYDK_SYSCONFIG_PLATFORM=$(echo -n $PYDK_PYTHON_HOST_PLATFORM|cut -d- -f1)-$(echo -n $PYDK_PYTHON_HOST_PLATFORM|cut -d- -f3)
7071

7172
# ============== wasi sdk ===============
7273

python-wasi-sdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ END
175175
# wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
176176
# TODO: window only has a zip archive, better use wasmtime-py instead.
177177

178-
wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-$(PLATFORM).tar.xz \
178+
wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-${PLATFORM}.tar.xz \
179179
-O-|xzcat|tar xfv -
180180
mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
181181
fi
@@ -299,7 +299,7 @@ END
299299
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
300300

301301
CPU=wasm32 TARGET=$TARGET \
302-
PYDK_PYTHON_HOST_PLATFORM=wasm32-${TARGET} \
302+
PYDK_SYSCONFIG_PLATFORM=wasm32-${TARGET} \
303303
PREFIX=/opt/python-wasm-sdk/devices/wasisdk/usr \
304304
./scripts/make-shells.sh
305305

python-wasm-sdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ END
175175
# wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
176176
# TODO: window only has a zip archive, better use wasmtime-py instead.
177177

178-
wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-$(PLATFORM).tar.xz \
178+
wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-${PLATFORM}.tar.xz \
179179
-O-|xzcat|tar xfv -
180180
mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
181181
fi
@@ -299,7 +299,7 @@ END
299299
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
300300

301301
CPU=wasm32 TARGET=$TARGET \
302-
PYDK_PYTHON_HOST_PLATFORM=wasm32-${TARGET} \
302+
PYDK_SYSCONFIG_PLATFORM=wasm32-${TARGET} \
303303
PREFIX=/opt/python-wasm-sdk/devices/wasisdk/usr \
304304
./scripts/make-shells.sh
305305

scripts/cpython-build-emsdk.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ include_dirs = $PREFIX/include
348348
NUMPY
349349

350350

351+
352+
353+
351354
. scripts/make-shells.sh
352355

353356
# C/C++/cmake shell
@@ -381,10 +384,11 @@ fi
381384
382385
export SYS_PYTHON=${SYS_PYTHON}
383386
export EMSDK_PYTHON=${SYS_PYTHON}
384-
export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_
387+
export _PYTHON_SYSCONFIGDATA_NAME=\${_PYTHON_SYSCONFIGDATA_NAME:-_sysconfigdata__emscripten_debug}
385388
386389
END
387390

391+
388392
# python shell
389393
cat > $HOST_PREFIX/bin/python3-wasm <<END
390394
#!/bin/bash

scripts/make-shells.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export SDKROOT=${SDKROOT}
1010
1111
export HOST_PREFIX=$HOST_PREFIX
1212
export PYDK_PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}
13+
export PYDK_SYSCONFIG_PLATFORM=${PYDK_SYSCONFIG_PLATFORM}
1314
export PLATFORM_TRIPLET=${PYDK_PYTHON_HOST_PLATFORM}
1415
1516
export PATH=${HOST_PREFIX}/bin:\$PATH:${SDKROOT}/devices/${TARGET}/usr/bin:$(echo -n ${SDKROOT}/emsdk/node/*/bin)

0 commit comments

Comments
 (0)