summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-02-20 18:15:10 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-02-20 20:12:07 +0100
commitac65b4bb7a75ec71294a527bc4139356fcbf0929 (patch)
treee227c30ec8f686e880b05591f7b058818b315b2f /configure.ac
parent89d97041e881ef6429c069e7d0485db50e0371b2 (diff)
WASM depend on Emscripten 3.1.3 for native EH
This reverts the special SjLj handling introduced in commit ae22f7d06246ee21f9c8e9f35f4477e88843c58b ("WASM add option to build with native exceptions"). This is supposed to work now; at least it compiles. Change-Id: I5ebceea9c7fe3c982d7c9a8818fd79f2018f03cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130219 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 6d81302b9e7e..af1da0103177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3073,7 +3073,19 @@ if test "$enable_wasm_strip" = "yes"; then
AC_DEFINE(ENABLE_WASM_STRIP_SWEXPORTS)
fi
+EMSCRIPTEN_NEH_MAJOR=3
+EMSCRIPTEN_NEH_MINOR=1
+EMSCRIPTEN_NEH_TINY=3
+EMSCRIPTEN_NEH_VERSION="${EMSCRIPTEN_NEH_MAJOR}.${EMSCRIPTEN_NEH_MINOR}.${EMSCRIPTEN_NEH_TINY}"
+
if test "$enable_wasm_exceptions" = yes; then
+ AC_MSG_CHECKING([if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION for SjLj + native EH])
+ check_semantic_version_three_prefixed EMSCRIPTEN NEH
+ if test $? -ne 0; then
+ AC_MSG_ERROR([no, found $EMSCRIPTEN_VERSION])
+ else
+ AC_MSG_RESULT([yes ($EMSCRIPTEN_VERSION)])
+ fi
ENABLE_WASM_EXCEPTIONS=TRUE
fi
AC_SUBST(ENABLE_WASM_EXCEPTIONS)