Skip to content

Commit 66fd3b8

Browse files
committed
fix wasi build
1 parent 5aa7831 commit 66fd3b8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

scripts/cpython-build-emsdk-prebuilt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PIP="${SDKROOT}/python3-wasm -m pip"
1111

1212
# pip pip-24.0 broken
1313
for module in typing_extensions mypy_extensions pyproject-metadata \
14-
setuptools build wheel pyparsing packaging \
14+
setuptools build wheel pyparsing packaging setuptools_scm \
1515
git+https://github.com/python-cffi/cffi meson-python git+https://github.com/pypa/installer
1616
do
1717
$PIP install --force $module

scripts/cpython-build-wasisdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ cross_compiling=yes
5959
END
6060

6161
pushd ${SDKROOT}/build/cpython-wasi
62-
sed -i 's| -Wl,--stack-first -Wl,--initial-memory=10485760|--stack-first --initial-memory=10485760|g' $PYSRC/configure.ac
63-
sed -i 's| -Wl,--stack-first -Wl,--initial-memory=10485760|--stack-first --initial-memory=10485760|g' $PYSRC/configure
62+
# sed -i 's| -Wl,--stack-first -Wl,--initial-memory=10485760| --stack-first --initial-memory=10485760|g' $PYSRC/configure.ac
63+
# sed -i 's| -Wl,--stack-first -Wl,--initial-memory=10485760| --stack-first --initial-memory=10485760|g' $PYSRC/configure
6464

6565
LDSHARED="${SDKROOT}/wasisdk/upstream/bin/wasm-ld --no-entry" CONFIG_SITE=$PYSRC/Tools/wasm/config.site-wasm32-wasisdk \
6666
$PYSRC/configure -C \

sources.wasm/microwindows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ END
9797
# FIXME: use pkg config !!!
9898

9999
EMCC_CFLAGS="-I${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/include/freetype2" \
100-
CC=emcc CXX=emc++ emmake make -C src NX11=Y NANOX=Y ARCH=EMSCRIPTEN LINK_APP_INTO_SERVER=Y NANOXDEMO=N ERASEMOVE=1
100+
CC=emcc CXX=emc++ emmake make -C src NX11=Y NANOX=Y MICROWIN=N ARCH=EMSCRIPTEN LINK_APP_INTO_SERVER=Y NANOXDEMO=N ERASEMOVE=1
101101

102102

103103
if [ -f /pp ]

0 commit comments

Comments
 (0)