Skip to content

Commit e83aa35

Browse files
committed
remove bzip2 pass
1 parent e41cf6e commit e83aa35

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

python-wasm-sdk.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ do
102102
lz4 -c --favor-decSpeed --best /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar \
103103
> /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar.lz4
104104

105-
if [ -f /lowend ]
105+
#if [ -f /lowend ]
106+
if true
106107
then
107108
# bzip2 is energy waste for local build
108109
rm /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar

scripts/cpython-build-emsdk.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ cat > $ROOT/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh <<END
333333
export ROOT=${SDKROOT}
334334
export SDKROOT=${SDKROOT}
335335
336+
export PYBUILD=\${PYBUILD:-$PYBUILD}
337+
export PYMAJOR=\$(echo -n \$PYBUILD|cut -d. -f1)
338+
export PYMINOR=\$(echo -n \$PYBUILD|cut -d. -f2)
336339
337340
if [[ ! -z \${EMSDK+z} ]]
338341
then
@@ -371,17 +374,14 @@ END
371374

372375
cat > $HOST_PREFIX/bin/python3-wasm <<END
373376
#!/bin/bash
374-
export PYBUILD=\${PYBUILD:-$PYBUILD}
375-
export PYMAJOR=\$(echo -n \$PYBUILD|cut -d. -f1)
376-
export PYMINOR=\$(echo -n \$PYBUILD|cut -d. -f2)
377377
378378
. ${SDKROOT}/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh
379379
380380
# most important
381-
export CC=cc
381+
export CC=emcc
382382
export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_debug
383383
384-
# does not work with -mpip
384+
# it's just for interactive python testing of modules.
385385
export PYTHONSTARTUP=$ROOT/support/__EMSCRIPTEN__.py
386386
387387
# so include dirs are good
@@ -393,7 +393,6 @@ export PYTHONHOME=$PREFIX
393393
PYTHONPATH=${HOST_PREFIX}/lib/python\${PYBUILD}/site-packages:\$PYTHONPATH
394394
export PYTHONPATH=${SDKROOT}/prebuilt/emsdk/${PYBUILD}:${HOST_PREFIX}/lib/python\${PYBUILD}/lib-dynload:\$PYTHONPATH
395395
396-
397396
# just in case
398397
export _PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}
399398
export PYTHON_FOR_BUILD=${HOST_PREFIX}/bin/python\${PYBUILD}

0 commit comments

Comments
 (0)