Run python with -E to ignore incoming PYTHONPATH/etc environment vari…

…ables (#16736)
emscripten-core · Jun 13, 2022 · e0c39d9 · e0c39d9
1 parent 48298d9
commit e0c39d9
Show file tree

Hide file tree

Showing 49 changed files with 270 additions and 131 deletions.
diff --git a/em++ b/em++
@@ -11,6 +11,10 @@
 # To make modifications to this file, edit `tools/run_python_compiler.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
@@ -29,7 +33,7 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$_EMCC_CCACHE" ]; then
-  exec "$PYTHON" "$0.py" "$@"
+  exec "$PYTHON" -E "$0.py" "$@"
 else
   unset _EMCC_CCACHE
   exec ccache "$0" "$@"

diff --git a/em++.bat b/em++.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -16,7 +18,7 @@
 :: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
 :: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
 @if "%_EMCC_CCACHE%"=="" (
-  set CMD="%EM_PY%" "%~dp0\%~n0.py"
+  set CMD="%EM_PY%" -E "%~dp0\%~n0.py"
 ) else (
   set _EMCC_CCACHE=
   set CMD=ccache "%~dp0\%~n0.bat"

diff --git a/em-config b/em-config
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$0.py" "$@"
+exec "$PYTHON" -E "$0.py" "$@"
diff --git a/em-config.bat b/em-config.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
diff --git a/emar b/emar
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$0.py" "$@"
+exec "$PYTHON" -E "$0.py" "$@"
diff --git a/emar.bat b/emar.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
diff --git a/embuilder b/embuilder
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$0.py" "$@"
+exec "$PYTHON" -E "$0.py" "$@"
diff --git a/embuilder.bat b/embuilder.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
diff --git a/emcc b/emcc
@@ -11,6 +11,10 @@
 # To make modifications to this file, edit `tools/run_python_compiler.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
@@ -29,7 +33,7 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$_EMCC_CCACHE" ]; then
-  exec "$PYTHON" "$0.py" "$@"
+  exec "$PYTHON" -E "$0.py" "$@"
 else
   unset _EMCC_CCACHE
   exec ccache "$0" "$@"

diff --git a/emcc.bat b/emcc.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -16,7 +18,7 @@
 :: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
 :: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
 @if "%_EMCC_CCACHE%"=="" (
-  set CMD="%EM_PY%" "%~dp0\%~n0.py"
+  set CMD="%EM_PY%" -E "%~dp0\%~n0.py"
 ) else (
   set _EMCC_CCACHE=
   set CMD=ccache "%~dp0\%~n0.bat"

diff --git a/emcc.py b/emcc.py
@@ -1104,7 +1104,7 @@ def run(args):
     args = [x for x in args if x != '--cflags']
     with misc_temp_files.get_file(suffix='.o') as temp_target:
       input_file = 'hello_world.c'
-      cmd = [shared.PYTHON, sys.argv[0], utils.path_from_root('tests', input_file), '-v', '-c', '-o', temp_target] + args
+      cmd = [shared.PYTHON, "-E", sys.argv[0], utils.path_from_root('tests', input_file), '-v', '-c', '-o', temp_target] + args
       proc = run_process(cmd, stderr=PIPE, check=False)
       if proc.returncode != 0:
         print(proc.stderr)

diff --git a/emcmake b/emcmake
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$0.py" "$@"
+exec "$PYTHON" -E "$0.py" "$@"
diff --git a/emcmake.bat b/emcmake.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
diff --git a/emconfigure b/emconfigure
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$0.py" "$@"
+exec "$PYTHON" -E "$0.py" "$@"
diff --git a/emconfigure.bat b/emconfigure.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\%~n0.py" %*
+@"%EM_PY%" -E "%~dp0\%~n0.py" %*
diff --git a/emdump b/emdump
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$(dirname $0)/tools/emdump.py" "$@"
+exec "$PYTHON" -E "$(dirname $0)/tools/emdump.py" "$@"
diff --git a/emdump.bat b/emdump.bat
@@ -7,7 +7,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.
+@set _PYTHON_SYSCONFIGDATA_NAME=
 @set EM_PY=%EMSDK_PYTHON%
 @if "%EM_PY%"=="" (
   set EM_PY=python
@@ -45,16 +47,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" "%~dp0\tools\emdump.py" %*
+@"%EM_PY%" -E "%~dp0\tools\emdump.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" "%~dp0\tools\emdump.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\tools\emdump.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" "%~dp0\tools\emdump.py" %* < NUL
+@"%EM_PY%" -E "%~dp0\tools\emdump.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" "%~dp0\tools\emdump.py" %*
+@"%EM_PY%" -E "%~dp0\tools\emdump.py" %*
diff --git a/emdwp b/emdwp
@@ -11,6 +11,10 @@
 # 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
@@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
   exit 1
 fi
 
-exec "$PYTHON" "$(dirname $0)/tools/emdwp.py" "$@"
+exec "$PYTHON" -E "$(dirname $0)/tools/emdwp.py" "$@"