diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-06-07 14:46:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-06-07 16:15:11 +0200 |
| commit | 50ca981f5597969adad4cb80b4d24aee0f05077d (patch) | |
| tree | 7e978eb3f0296636265485aebf1adca007612fdf /desktop/Executable_soffice_bin.mk | |
| parent | 4d599b5a9702863be8c5927ab657d4a3805570e7 (diff) | |
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 <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
Diffstat (limited to 'desktop/Executable_soffice_bin.mk')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 15 |
1 files changed, 8 insertions, 7 deletions
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: |