desktop/Executable_soffice_bin.mk | 15 ++++++++------- solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-)
New commits: commit 50ca981f5597969adad4cb80b4d24aee0f05077d Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Jun 7 14:46:19 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Jun 7 16:15:11 2024 +0200 Make Embind-related code also available under --disable-dbgutil ...and just keep embindtest.js --enable-dbgutil--only. For convenience when using EMSCRIPTEN_EXTRA_SOFFICE_POST_JS recently introduced in 82640810efd1636e358c047a1a5b3e4e3fc9d28a "New EMSCRIPTEN_EXTRA_SOFFICE_POST_JS configure variable". Change-Id: I03311d89ff14a70f84e03e99ab8e609641ea589b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168552 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index b9ce457abbc0..d6a271dec796 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -71,25 +71,26 @@ $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ )) endif -ifneq ($(ENABLE_DBGUTIL),) - $(call gb_Executable_get_linktarget_target,soffice_bin): \ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ - $(SRCDIR)/unotest/source/embindtest/embindtest.js + $(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS) $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ --post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ - --post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \ + $(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS),--post-js $(i)) \ )) -endif +ifneq ($(ENABLE_DBGUTIL),) -$(call gb_Executable_get_linktarget_target,soffice_bin): $(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS) +$(call gb_Executable_get_linktarget_target,soffice_bin): \ + $(SRCDIR)/unotest/source/embindtest/embindtest.js $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ - $(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS),--post-js $(i)) \ + --post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \ )) endif +endif + # vim: set ts=4 sw=4 et: diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index fb186a5fe7c0..26570fb2f314 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -20,7 +20,7 @@ gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4 # To keep the link time (and memory) down, prevent all rewriting options from wasm-emscripten-finalize # See emscripten.py, finalize_wasm, modify_wasm = True # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK) -gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain"$(if $(ENABLE_DBGUTIL),$(COMMA)"addOnPostRun"),"registerType","throwBindingError"$(if $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")] +gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")] gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB gb_Executable_EXT := .html
