@@ -1911,30 +1911,30 @@ fi
19111911# WASM flags
19121912AS_CASE ( [ $ac_sys_system/$ac_sys_emscripten_target] ,
19131913 [ 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)"
19161916 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"] )
19181918 ] )
19191919 WASM_ASSETS_DIR=".\$(prefix)"
19201920 WASM_STDLIB="\$(WASM_ASSETS_DIR)/local/lib/python\$(VERSION)/os.py"
19211921 dnl separate-dwarf does not seem to work in Chrome DevTools Support.
19221922 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"
19241924 LINKFORSHARED="$LINKFORSHARED -gsource-map --emit-symbol-map"
19251925 else
19261926 LINKFORSHARED="$LINKFORSHARED -O2 -g0"
19271927 fi
19281928 ] ,
19291929 [ 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"
19321932 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"] )
19341934 ] )
19351935 CFLAGS_NODIST="$CFLAGS_NODIST -pthread"
19361936 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"
19381938 LINKFORSHARED="$LINKFORSHARED -gseparate-dwarf --emit-symbol-map"
19391939 else
19401940 LINKFORSHARED="$LINKFORSHARED -O2 -g0"
30093009dnl Emscripten's emconfigure sets LDSHARED. Set BLDSHARED outside the
30103010dnl test -z $LDSHARED block to configure BLDSHARED for side module support.
30113011if 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'
30133013fi
30143014
30153015AC_MSG_RESULT ( $LDSHARED )
@@ -4496,7 +4496,8 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
44964496] )
44974497
44984498if 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"
45004501fi
45014502
45024503dnl binascii can use zlib for optimized crc32.
@@ -4518,7 +4519,8 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
45184519] )
45194520
45204521if 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"
45224524fi
45234525
45244526
0 commit comments