configure.ac | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 962c76d85bef03fb717914d8eddda9295427614a
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Aug 21 20:22:47 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Aug 21 22:49:59 2024 +0200
Allow building against emsdk that uses Emscripten trunk
(see
<https://github.com/emscripten-core/emsdk/?tab=readme-ov-file#how-do-i-track-the-latest-emscripten-development-with-the-sdk>),
which has emscripten/main/ instead of upstream/emscripten/
Change-Id: I10dfc7e30cddf8a798cb70104126b45757fcba63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 123c03e35661..2c11703cb3ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1446,6 +1446,9 @@ if test "$_os" = "Emscripten"; then
AS_IF([test -z "$EMSDK"],
[AC_MSG_ERROR([No \$EMSDK environment variable.])])
EMSCRIPTEN_VERSION_H=$EMSDK/upstream/emscripten/cache/sysroot/include/emscripten/version.h
+ if test ! -f "$EMSCRIPTEN_VERSION_H"; then
+
EMSCRIPTEN_VERSION_H=$EMSDK/emscripten/main/cache/sysroot/include/emscripten/version.h
+ fi
fi
if test -f "$EMSCRIPTEN_VERSION_H"; then
EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H"
| $SED -ne 's/.*__EMSCRIPTEN_major__ //p')
