cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emscripten: don't use a memory init file any more.

Browse Source 
It doesn't take that long to load the module, and it's going to make
users' life way easier.
This commit is contained in:
Frank Denis 2015-01-17 22:11:10 +01:00
parent 5efaad1997
commit e7f410de10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -423,7 +423,7 @@ AC_SUBST([LIBTOOL_EXTRA_FLAGS])
TEST_LDFLAGS='' TEST_LDFLAGS=''
AS_IF([test "x$EMSCRIPTEN" != "x"],[ AS_IF([test "x$EMSCRIPTEN" != "x"],[
EXEEXT=.js EXEEXT=.js
TEST_LDFLAGS='--pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8' TEST_LDFLAGS='--memory-init-file 0 --pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
]) ])
AC_SUBST(TEST_LDFLAGS) AC_SUBST(TEST_LDFLAGS)
AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"]) AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"])

2
dist-build/emscripten.sh
View File

@ -13,7 +13,7 @@ emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" \
CFLAGS="-O3" && \ CFLAGS="-O3" && \
emmake make clean && \ emmake make clean && \
emmake make $MAKE_FLAGS install V=1 && \ emmake make $MAKE_FLAGS install V=1 && \
emcc -O3 --closure 1 --llvm-lto 1 $LDFLAGS $JS_EXPORTS_FLAGS \ emcc -O3 --closure 1 --llvm-lto 1 --memory-init-file 0 $LDFLAGS $JS_EXPORTS_FLAGS \
"${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1 "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1
if test "x$NODE" = x; then if test "x$NODE" = x; then