remix

Author: pmp-p

emsdk-cc

@@ -16,8 +16,11 @@ PREFIX = Path(os.environ.get("PREFIX", "/opt/python-wasm-sdk/devices/emsdk/usr")
 
 sys.argv.pop(0)
 
-EXEC = sys.argv.pop(0)
-EXEC = f"{EMSDK}/upstream/emscripten/emcc.py"
+# point to emscripten cc
+if not sys.argv[0].endswith('.py'):
+    EXEC = f"{EMSDK}/upstream/emscripten/emcc.py"
+else:
+    EXEC = sys.argv.pop(0)
 
 args = sys.argv
 
@@ -316,7 +319,10 @@ else:
         else:
             EXE = False
 
-    if EXE and not (HTML or USE_RAWFS):
+    # potentially executable running via js
+    # TODO: handle js runtimes other than shipped node.
+    # TODO: full node path
+    if (EXE and USE_RAWFS) and not HTML:
         if AOUT.endswith(".cjs") or AOUT.endswith(".js"):
 
             def make_exe(*argv, **kw):

scripts/cpython-build-emsdk.sh

@@ -209,8 +209,11 @@ END
 
     popd
 
+    chmod +x ${SDKROOT}/emsdk-cc
+
+    export PYDK_CC=true
     PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" CONFIG_SITE=$ROOT/src/cpython${PYBUILD}/Tools/wasm/config.site-wasm32-pydk \
-    EMCC_CFLAGS="-fpic" emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser $GIL \
+     emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser $GIL \
      --cache-file=${PYTHONPYCACHEPREFIX}/config.cache \
      --enable-wasm-dynamic-linking $TESTSUITE\
      --host=$PYDK_PYTHON_HOST_PLATFORM \
@@ -219,7 +222,6 @@ END
      --with-build-python=${PYTHON_FOR_BUILD} \
      ${EXTRA_PYOPTS}
 
-
     mkdir -p ${PYTHONPYCACHEPREFIX}/empty
     touch ${PYTHONPYCACHEPREFIX}/empty/$($HPY -V|cut -f2 -d' ')
 
@@ -318,7 +320,7 @@ END
     fi
 fi
 
-
+unset PYDK_CC
 
 # FIXME: seems CI cannot locate that one with python3-wasm
 

scripts/emsdk-fetch.sh

@@ -217,19 +217,20 @@ END
 EMCC_TRACE=\${EMCC_TRACE:-false}
 if \$EMCC_TRACE
 then
-echo "
-$@" >> $SDKROOT/emcc.log
-
+    echo "
+\$0 \$@" >> $SDKROOT/emcc.log
 fi
 
 unset _EMCC_CCACHE
-
-#if [ -z "\$_EMCC_CCACHE" ]
-#then
-
 unset _PYTHON_SYSCONFIGDATA_NAME
 unset PYTHONHOME
 unset PYTHONPATH
+if \${PYDK_CC:-false}
+then
+    $EMSDK_PYTHON -E $SDKROOT/emsdk-cc \$0.py "\$@"
+    exit \$?
+fi
+
 
 # -Wwarn-absolute-paths
 # --valid-abspath ${SDKROOT}

sources.wasm/5000-ncurses-65.sh

@@ -12,7 +12,7 @@ NCOPTS="--enable-ext-colors --enable-ext-mouse --prefix=$PREFIX --disable-echo -
  --with-pkg-config-libdir=$PREFIX/lib/pkgconfig \
  --with-termlib --enable-termcap --disable-database"
 
-
+export PYDK_CC=true
 export NCURSES=${NCURSES:-"ncurses-6.5"}
 export URL_NCURSES=${URL_NCURSES:-"https://invisible-mirror.net/archives/ncurses/$NCURSES.tar.gz"}