@@ -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 -s ALLOW_MEMORY_GROWTH =1"
1915
- LINKFORSHARED="--preload-file \$(WASM_ASSETS_DIR)"
1914
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH =1"
1915
+ LINKFORSHARED="--preload-file= \$(WASM_ASSETS_DIR)"
1916
1916
AS_VAR_IF ( [ enable_wasm_dynamic_linking] , [ yes] , [
1917
- AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -s MAIN_MODULE =1"] )
1917
+ AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE =1"] )
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 -s ASSERTIONS =1"
1923
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS =1"
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 -s ALLOW_MEMORY_GROWTH =1 -s NODERAWFS =1 -s USE_PTHREADS =1"
1931
- LINKFORSHARED="-s PROXY_TO_PTHREAD =1 -s EXIT_RUNTIME =1"
1930
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sALLOW_MEMORY_GROWTH =1 -sNODERAWFS =1 -sUSE_PTHREADS =1"
1931
+ LINKFORSHARED="-sPROXY_TO_PTHREAD =1 -sEXIT_RUNTIME =1"
1932
1932
AS_VAR_IF ( [ enable_wasm_dynamic_linking] , [ yes] , [
1933
- AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -s MAIN_MODULE =1"] )
1933
+ AS_VAR_APPEND ( [ LINKFORSHARED] , [ " -sMAIN_MODULE =1"] )
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 -s ASSERTIONS =1"
1937
+ LDFLAGS_NODIST="$LDFLAGS_NODIST -sASSERTIONS =1"
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 -s SIDE_MODULE =1 -s WASM =1'
3012
+ BLDSHARED='$(CC) -shared -sSIDE_MODULE =1 -sWASM =1'
3013
3013
fi
3014
3014
3015
3015
AC_MSG_RESULT ( $LDSHARED )
@@ -4496,7 +4496,8 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
4496
4496
] )
4497
4497
4498
4498
if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
4499
- ZLIB_LIBS="-s USE_ZLIB=1"
4499
+ ZLIB_CFLAGS="-sUSE_ZLIB=1"
4500
+ ZLIB_LIBS="-sUSE_ZLIB=1"
4500
4501
fi
4501
4502
4502
4503
dnl binascii can use zlib for optimized crc32.
@@ -4518,7 +4519,8 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
4518
4519
] )
4519
4520
4520
4521
if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
4521
- BZIP2_LIBS="-s USE_BZIP2=1"
4522
+ BZIP2_CFLAGS="-sUSE_BZIP2=1"
4523
+ BZIP2_LIBS="-sUSE_BZIP2=1"
4522
4524
fi
4523
4525
4524
4526
0 commit comments