desktop/Executable_soffice_bin.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9d84957863d274501fe130319d972a3fc2572503
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu May 2 10:40:35 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri May 3 10:23:56 2024 +0200
Simplify condition
...after this got wrapped in an outer
> ifeq ($(OS),EMSCRIPTEN)
in cf0b0f0dd04fae98b686cd5768673c217a58fab6 "Emscripten: Only add the
--pre-js
code to the soffice executable"
Change-Id: Ic2b9ae7709a06146a206ebaa2ee8881387dae6b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166998
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/desktop/Executable_soffice_bin.mk
b/desktop/Executable_soffice_bin.mk
index dba50e637aba..8ffd04ee1c24 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -33,7 +33,7 @@ $(call gb_LinkTarget_get_target,$(call
gb_Executable_get_linktarget,soffice_bin)
# don't sort; later can override previous settings!
$(eval $(call
gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/environment.js))
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(call
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link))
-ifeq ($(OS)-$(ENABLE_QT5),EMSCRIPTEN-TRUE)
+ifeq ($(ENABLE_QT5),TRUE)
$(eval $(call
gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/soffice_args.js))
endif
endif
