@@ -1574,10 +1574,10 @@ if test "$Py_OPT" = 'true' ; then
1574
1574
] )
1575
1575
;;
1576
1576
esac
1577
- elif test "$ac_sys_system" = "Emscripten"; then
1577
+ elif test "$ac_sys_system" = "Emscripten" -o "$ac_sys_system" = "WASI" ; then
1578
1578
dnl Emscripten does not support shared extensions yet. Build
1579
- dnl "python.[js,html, wasm]", "pybuilddir.txt", and "platform" files.
1580
- DEF_MAKE_ALL_RULE="build_platform "
1579
+ dnl "python.[js,wasm]", "pybuilddir.txt", and "platform" files.
1580
+ DEF_MAKE_ALL_RULE="build_wasm "
1581
1581
REQUIRE_PGO="no"
1582
1582
DEF_MAKE_RULE="all"
1583
1583
else
@@ -1911,30 +1911,30 @@ fi
1911
1911
# WASM flags
1912
1912
AS_CASE ( [ $ac_sys_system/$ac_sys_emscripten_target] ,
1913
1913
[ Emscripten/browser*] , [
1914
- LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1 "
1914
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH"
1915
1915
LINKFORSHARED="--preload-file=\$(WASM_ASSETS_DIR)"
1916
1916
AS_VAR_IF ( [ enable_wasm_dynamic_linking] , [ yes] , [
1917
- AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE=1 "] )
1917
+ AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE"] )
1918
1918
] )
1919
1919
WASM_ASSETS_DIR=".\$(prefix)"
1920
1920
WASM_STDLIB="\$(WASM_ASSETS_DIR)/local/lib/python\$(VERSION)/os.py"
1921
1921
dnl separate-dwarf does not seem to work in Chrome DevTools Support.
1922
1922
if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "browser-debug"; then
1923
- LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1 "
1923
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS"
1924
1924
LINKFORSHARED="$LINKFORSHARED -gsource-map --emit-symbol-map"
1925
1925
else
1926
1926
LINKFORSHARED="$LINKFORSHARED -O2 -g0"
1927
1927
fi
1928
1928
] ,
1929
1929
[ Emscripten/node*] , [
1930
- LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH=1 -sNODERAWFS=1 -sUSE_PTHREADS=1 "
1931
- LINKFORSHARED="-sPROXY_TO_PTHREAD=1 -sEXIT_RUNTIME=1 "
1930
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH -sNODERAWFS -sUSE_PTHREADS"
1931
+ LINKFORSHARED="-sPROXY_TO_PTHREAD -sEXIT_RUNTIME"
1932
1932
AS_VAR_IF ( [ enable_wasm_dynamic_linking] , [ yes] , [
1933
- AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE=1 "] )
1933
+ AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE"] )
1934
1934
] )
1935
1935
CFLAGS_NODIST="$CFLAGS_NODIST -pthread"
1936
1936
if test "$Py_DEBUG" = 'true' -o "$ac_sys_emscripten_target" = "node-debug"; then
1937
- LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS=1 "
1937
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS"
1938
1938
LINKFORSHARED="$LINKFORSHARED -gseparate-dwarf --emit-symbol-map"
1939
1939
else
1940
1940
LINKFORSHARED="$LINKFORSHARED -O2 -g0"
3009
3009
dnl Emscripten's emconfigure sets LDSHARED. Set BLDSHARED outside the
3010
3010
dnl test -z $LDSHARED block to configure BLDSHARED for side module support.
3011
3011
if test "$enable_wasm_dynamic_linking" = "yes" -a "$ac_sys_system" = "Emscripten"; then
3012
- BLDSHARED='$(CC) -shared -sSIDE_MODULE=1 -sWASM=1 '
3012
+ BLDSHARED='$(CC) -shared -sSIDE_MODULE=1'
3013
3013
fi
3014
3014
3015
3015
AC_MSG_RESULT ( $LDSHARED )
@@ -4549,8 +4549,8 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
4549
4549
] )
4550
4550
4551
4551
if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
4552
- ZLIB_CFLAGS="-sUSE_ZLIB=1 "
4553
- ZLIB_LIBS="-sUSE_ZLIB=1 "
4552
+ ZLIB_CFLAGS="-sUSE_ZLIB"
4553
+ ZLIB_LIBS="-sUSE_ZLIB"
4554
4554
fi
4555
4555
4556
4556
dnl binascii can use zlib for optimized crc32.
@@ -4572,8 +4572,8 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
4572
4572
] )
4573
4573
4574
4574
if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
4575
- BZIP2_CFLAGS="-sUSE_BZIP2=1 "
4576
- BZIP2_LIBS="-sUSE_BZIP2=1 "
4575
+ BZIP2_CFLAGS="-sUSE_BZIP2"
4576
+ BZIP2_LIBS="-sUSE_BZIP2"
4577
4577
fi
4578
4578
4579
4579
@@ -6557,21 +6557,18 @@ fi],
6557
6557
6558
6558
# Check whether to disable test modules. Once set, setup.py will not build
6559
6559
# test extension modules and "make install" will not install test suites.
6560
- AC_MSG_CHECKING ( for -- disable-test-modules )
6561
- AC_ARG_ENABLE ( test-modules ,
6562
- AS_HELP_STRING ( [ --disable-test-modules] , [ don't build nor install test modules] ) )
6563
- if test "$enable_test_modules" = no; then
6564
- TEST_MODULES=no
6565
- else
6566
- AS_CASE ( [ $ac_sys_system/$ac_sys_emscripten_target] ,
6567
- [ Emscripten/browser*] , [ TEST_MODULES=no] ,
6568
- [ TEST_MODULES=yes]
6569
- )
6570
- fi
6571
- AS_VAR_IF ( [ TEST_MODULES] , [ yes] ,
6572
- [ AC_MSG_RESULT ( no ) ] , [ AC_MSG_RESULT ( yes ) ]
6573
- )
6574
- AC_SUBST ( TEST_MODULES )
6560
+ AC_MSG_CHECKING ( [ for --disable-test-modules] )
6561
+ AC_ARG_ENABLE ( [ test-modules] ,
6562
+ [ AS_HELP_STRING ( [ --disable-test-modules] , [ don't build nor install test modules] ) ] , [
6563
+ AS_VAR_IF ( [ enable_test_modules] , [ yes] , [ TEST_MODULES=yes] , [ TEST_MODULES=no] )
6564
+ ] , [
6565
+ AS_CASE ( [ $ac_sys_system/$ac_sys_emscripten_target] ,
6566
+ [ Emscripten/browser*] , [ TEST_MODULES=no] ,
6567
+ [ TEST_MODULES=yes]
6568
+ )
6569
+ ] )
6570
+ AC_MSG_RESULT ( [ $TEST_MODULES] )
6571
+ AC_SUBST ( [ TEST_MODULES] )
6575
6572
6576
6573
AC_DEFUN ( [ PY_STDLIB_MOD_SET_NA] , [
6577
6574
m4_foreach ( [ mod] , [ $@ ] , [
0 commit comments