diff options
| author | Tor Lillqvist <tml@collabora.com> | 2023-01-12 21:47:24 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2023-01-13 10:11:44 +0000 |
| commit | 22cb88b25ba9a52ca0e0eaa3fd116f5fbcc9422f (patch) | |
| tree | f3fad3ed5749c3f77977c21ea20b029d9248486d /configure.ac | |
| parent | 402ab3d145a1e8e123caabf4567aef7b6631fc3c (diff) | |
Fix Emscripten version check to still work with older SDK versions
Change-Id: I051b5edd5936bcb94521f88ec7a7a762c66c9283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145419
Tested-by: Jenkins
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 93a1c89e3569..56119241c743 100644 --- a/configure.ac +++ b/configure.ac @@ -1413,11 +1413,17 @@ 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 - AS_IF([test ! -f "$EMSCRIPTEN_VERSION_H"], - [AC_MSG_ERROR([Could not find the <emscripten/version.h> in the Emscripten SDK.])]) - EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') - EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') - EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p') + if test -f "$EMSCRIPTEN_VERSION_H"; then + EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') + EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') + EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p') + else + EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_) + EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') + EMSCRIPTEN_MINOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') + EMSCRIPTEN_TINY=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p') + fi + EMSCRIPTEN_VERSION="${EMSCRIPTEN_MAJOR}.${EMSCRIPTEN_MINOR}.${EMSCRIPTEN_TINY}" check_semantic_version_three_prefixed EMSCRIPTEN MIN |