Skip to content

Commit c5ef12d

Browse files
committed
fix 3.14 triple check
1 parent f9d4382 commit c5ef12d

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build:
1919
runs-on: ubuntu-22.04
2020
env:
21-
BUILDS: 3.12 3.13
21+
BUILDS: 3.12 3.13 3.14
2222
SDKROOT: /opt/python-wasm-sdk
2323
Py_GIL_DISABLED: false
2424
wasisdk: true

config

+5-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ export WASMTIME_HOME=$WASISDK
8080

8181
# EXTRABINS="$EXTRABINS $WASISDK/bin"
8282

83+
# =============== JDK =======================
84+
export JAVA_HOME=${SDKROOT}/jdk
85+
EXTRABINS="$EXTRABINS ${JAVA_HOME}/bin"
86+
8387
# =============== Nimrod ====================
8488

8589
# stable
@@ -126,7 +130,7 @@ EXTRABINS="$EXTRABINS $BUN_INSTALL/bin"
126130

127131
# ================ aosp ===================
128132

129-
AOSP_NDK=25.2.9519653
133+
AOSP_NDK=${AOSP_NDK:-25.2.9519653}
130134

131135

132136
# =========== panda3d =================

scripts/cpython-build-emsdk.sh

+6
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ END
207207
EXTRA="--without-pydebug --without-trace-refs --without-dsymutil --without-pymalloc --without-strict-overflow"
208208
fi
209209

210+
if [ ${PYMINOR} -ge 14 ]
211+
then
212+
sed -i 's|wasm32-unknown-emscripten|wasm32-bi-emscripten|g' Makefile.pre.in
213+
fi
214+
215+
210216
popd
211217

212218
chmod +x ${SDKROOT}/emsdk-cc

0 commit comments

Comments
 (0)