diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-09 01:26:25 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-19 10:51:14 +0100 |
| commit | e76c7cf17827405344c995f5396cc21644f52213 (patch) | |
| tree | ff2daabc72b0909b473d68d82eb568d24c3b7994 /external | |
| parent | ad5563b4f210b32bcdd7a2efb167ce2c2745f9db (diff) | |
WASM boost: fix build with Emscripten
boost probably expects a WASI, not Emscripten.
Change-Id: I7f275e1b501d6ea46d43637be815bf5a45b1cc40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128586
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost-emscripten-nowasm.patch.0 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 838c495c5161..beb03a436550 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -44,6 +44,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3)) $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),external/boost/$(patch)) \ external/boost/boost-emscripten-noshm.patch.0 \ + external/boost/boost-emscripten-nowasm.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/boost/boost-emscripten-nowasm.patch.0 b/external/boost/boost-emscripten-nowasm.patch.0 new file mode 100644 index 000000000000..39723351e380 --- /dev/null +++ b/external/boost/boost-emscripten-nowasm.patch.0 @@ -0,0 +1,11 @@ +--- boost/config/detail/select_platform_config.hpp.orig 2021-11-13 18:32:09.446182220 +0100 ++++ boost/config/detail/select_platform_config.hpp 2021-11-13 18:32:57.734041110 +0100 +@@ -89,7 +89,7 @@ + // Nuxi CloudABI: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/cloudabi.hpp" + +-#elif defined (__wasm__) ++#elif defined (__wasm__) && !defined (__EMSCRIPTEN__) + // Web assembly: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/wasm.hpp" + |