From 104cf1fad998786d128084846ce31ac33ebaebb7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 5 May 2023 16:20:29 -0400 Subject: [PATCH 1/3] fix: make _PYTHON_SYSCONFIGDATA_NAME available to cmake --- emcmake | 6 +++++- emcmake.bat | 4 +++- emcmake.py | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/emcmake b/emcmake index 1a3a1c9691685..e598f3163fe82 100755 --- a/emcmake +++ b/emcmake @@ -12,9 +12,13 @@ # `tools/create_entry_points.py` # $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. +# of cpython used in cross compilation via setup.py. Pass it through our +# own internal variable. +set _EMCMAKE_PYTHON_SYSCONFIGDATA_NAMES "$_PYTHON_SYSCONFIGDATA_NAMES" unset _PYTHON_SYSCONFIGDATA_NAME + + if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emcmake.bat b/emcmake.bat index 34900168d5856..50044bc1ebd7a 100644 --- a/emcmake.bat +++ b/emcmake.bat @@ -11,7 +11,9 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. +:: of cpython used in cross compilation via setup.py. Pass it through our +:: own internal variable. +@set _EMCMAKE_PYTHON_SYSCONFIGDATA_NAMES="%_PYTHON_SYSCONFIGDATA_NAMES%" @set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( diff --git a/emcmake.py b/emcmake.py index 42cfbf14bc859..b9c932c1f1132 100755 --- a/emcmake.py +++ b/emcmake.py @@ -27,6 +27,9 @@ def run(): args = sys.argv[1:] + # Restore removed SYSCONFIG settings so they will be present in the CMake environment + os.environ["_PYTHON_SYSCONFIGDATA_NAME"] = os.environ["_EMCMAKE_PYTHON_SYSCONFIGDATA_NAME"] + def has_substr(args, substr): return any(substr in s for s in args) From 0713082983555ca2295b5bb252bbfbd5ff8390f4 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 9 May 2023 14:33:42 -0400 Subject: [PATCH 2/3] refactor: remove filtering Signed-off-by: Henry Schreiner --- emcmake | 7 ------- emcmake.bat | 5 ----- emcmake.py | 3 --- 3 files changed, 15 deletions(-) diff --git a/emcmake b/emcmake index e598f3163fe82..a811f90953c3c 100755 --- a/emcmake +++ b/emcmake @@ -11,13 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. Pass it through our -# own internal variable. -set _EMCMAKE_PYTHON_SYSCONFIGDATA_NAMES "$_PYTHON_SYSCONFIGDATA_NAMES" -unset _PYTHON_SYSCONFIGDATA_NAME - - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON diff --git a/emcmake.bat b/emcmake.bat index 50044bc1ebd7a..deb8d5e6e8014 100644 --- a/emcmake.bat +++ b/emcmake.bat @@ -10,11 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. Pass it through our -:: own internal variable. -@set _EMCMAKE_PYTHON_SYSCONFIGDATA_NAMES="%_PYTHON_SYSCONFIGDATA_NAMES%" -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emcmake.py b/emcmake.py index b9c932c1f1132..42cfbf14bc859 100755 --- a/emcmake.py +++ b/emcmake.py @@ -27,9 +27,6 @@ def run(): args = sys.argv[1:] - # Restore removed SYSCONFIG settings so they will be present in the CMake environment - os.environ["_PYTHON_SYSCONFIGDATA_NAME"] = os.environ["_EMCMAKE_PYTHON_SYSCONFIGDATA_NAME"] - def has_substr(args, substr): return any(substr in s for s in args) From fcfc6e363d13f0d6c412f9bc96109c15740d9577 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 16 May 2023 13:12:11 -0400 Subject: [PATCH 3/3] WIP: try removing all _PYTHON_SYSCONFIGDATA_NAME hiding Signed-off-by: Henry Schreiner --- em-config | 4 ---- em-config.bat | 3 --- emar | 4 ---- emar.bat | 3 --- embuilder | 4 ---- embuilder.bat | 3 --- emcmake | 1 - emconfigure | 4 ---- emconfigure.bat | 3 --- emdump | 4 ---- emdump.bat | 3 --- emdwp | 4 ---- emdwp.bat | 3 --- emmake | 4 ---- emmake.bat | 3 --- emnm | 4 ---- emnm.bat | 3 --- emprofile | 4 ---- emprofile.bat | 3 --- emranlib | 4 ---- emranlib.bat | 3 --- emrun | 4 ---- emrun.bat | 3 --- emscons | 4 ---- emscons.bat | 3 --- emsize | 4 ---- emsize.bat | 3 --- emstrip | 4 ---- emstrip.bat | 3 --- emsymbolizer | 4 ---- emsymbolizer.bat | 3 --- system/bin/sdl-config | 4 ---- system/bin/sdl-config.bat | 3 --- system/bin/sdl2-config | 4 ---- system/bin/sdl2-config.bat | 3 --- test/runner | 4 ---- test/runner.bat | 3 --- tools/file_packager | 4 ---- tools/file_packager.bat | 3 --- tools/run_python.bat | 3 --- tools/run_python.sh | 4 ---- tools/webidl_binder | 4 ---- tools/webidl_binder.bat | 3 --- 43 files changed, 148 deletions(-) diff --git a/em-config b/em-config index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/em-config +++ b/em-config @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/em-config.bat b/em-config.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/em-config.bat +++ b/em-config.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emar b/emar index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emar +++ b/emar @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emar.bat b/emar.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emar.bat +++ b/emar.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/embuilder b/embuilder index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/embuilder +++ b/embuilder @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/embuilder.bat b/embuilder.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/embuilder.bat +++ b/embuilder.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emcmake b/emcmake index a811f90953c3c..34eaae2cc79b4 100755 --- a/emcmake +++ b/emcmake @@ -11,7 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emconfigure b/emconfigure index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emconfigure +++ b/emconfigure @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emconfigure.bat b/emconfigure.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emconfigure.bat +++ b/emconfigure.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emdump b/emdump index b60c6e0083469..2e57aac08add3 100755 --- a/emdump +++ b/emdump @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emdump.bat b/emdump.bat index c0d7d3ecd28e8..9c6bfe5e7730d 100644 --- a/emdump.bat +++ b/emdump.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emdwp b/emdwp index f39d54e64288c..738c0f9f3edcc 100755 --- a/emdwp +++ b/emdwp @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emdwp.bat b/emdwp.bat index 3c056794f3564..8bf4188c60d06 100644 --- a/emdwp.bat +++ b/emdwp.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emmake b/emmake index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emmake +++ b/emmake @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emmake.bat b/emmake.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emmake.bat +++ b/emmake.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emnm b/emnm index 4920cf7017247..063ca060c3a68 100755 --- a/emnm +++ b/emnm @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emnm.bat b/emnm.bat index 4257155a7a8d9..82d579f55b4bd 100644 --- a/emnm.bat +++ b/emnm.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emprofile b/emprofile index 998a39e28d0cf..010014eea221e 100755 --- a/emprofile +++ b/emprofile @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emprofile.bat b/emprofile.bat index 5908117caad95..b2f580f560bba 100644 --- a/emprofile.bat +++ b/emprofile.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emranlib b/emranlib index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emranlib +++ b/emranlib @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emranlib.bat b/emranlib.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emranlib.bat +++ b/emranlib.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emrun b/emrun index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emrun +++ b/emrun @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emrun.bat b/emrun.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emrun.bat +++ b/emrun.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emscons b/emscons index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emscons +++ b/emscons @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emscons.bat b/emscons.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emscons.bat +++ b/emscons.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emsize b/emsize index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emsize +++ b/emsize @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emsize.bat b/emsize.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emsize.bat +++ b/emsize.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emstrip b/emstrip index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emstrip +++ b/emstrip @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emstrip.bat b/emstrip.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emstrip.bat +++ b/emstrip.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/emsymbolizer b/emsymbolizer index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/emsymbolizer +++ b/emsymbolizer @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/emsymbolizer.bat b/emsymbolizer.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/emsymbolizer.bat +++ b/emsymbolizer.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/system/bin/sdl-config b/system/bin/sdl-config index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/system/bin/sdl-config +++ b/system/bin/sdl-config @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/system/bin/sdl-config.bat b/system/bin/sdl-config.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/system/bin/sdl-config.bat +++ b/system/bin/sdl-config.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/system/bin/sdl2-config b/system/bin/sdl2-config index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/system/bin/sdl2-config +++ b/system/bin/sdl2-config @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/system/bin/sdl2-config.bat b/system/bin/sdl2-config.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/system/bin/sdl2-config.bat +++ b/system/bin/sdl2-config.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/test/runner b/test/runner index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/test/runner +++ b/test/runner @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/test/runner.bat b/test/runner.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/test/runner.bat +++ b/test/runner.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/tools/file_packager b/tools/file_packager index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/tools/file_packager +++ b/tools/file_packager @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/tools/file_packager.bat b/tools/file_packager.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/tools/file_packager.bat +++ b/tools/file_packager.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/tools/run_python.bat b/tools/run_python.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/tools/run_python.bat +++ b/tools/run_python.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python diff --git a/tools/run_python.sh b/tools/run_python.sh index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/tools/run_python.sh +++ b/tools/run_python.sh @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/tools/webidl_binder b/tools/webidl_binder index 1a3a1c9691685..34eaae2cc79b4 100755 --- a/tools/webidl_binder +++ b/tools/webidl_binder @@ -11,10 +11,6 @@ # To make modifications to this file, edit `tools/run_python.sh` and then run # `tools/create_entry_points.py` -# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -# of cpython used in cross compilation via setup.py. -unset _PYTHON_SYSCONFIGDATA_NAME - if [ -z "$PYTHON" ]; then PYTHON=$EMSDK_PYTHON fi diff --git a/tools/webidl_binder.bat b/tools/webidl_binder.bat index 34900168d5856..deb8d5e6e8014 100644 --- a/tools/webidl_binder.bat +++ b/tools/webidl_binder.bat @@ -10,9 +10,6 @@ :: All env. vars specified in this file are to be local only to this script. @setlocal -:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal -:: of cpython used in cross compilation via setup.py. -@set _PYTHON_SYSCONFIGDATA_NAME= @set EM_PY=%EMSDK_PYTHON% @if "%EM_PY%"=="" ( set EM_PY=python