diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-10-02 23:57:44 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-19 10:56:49 +0100 |
| commit | a27296ded79e9eb8fa325ea05fcd560d171cabbd (patch) | |
| tree | bd2a3f5edce7524f61a1a9be56a37445f6c8806b /solenv/gbuild/platform | |
| parent | f090004c5f236275ca5142fc578f0375872c0336 (diff) | |
WASM gbuild: add --pre-js dependencies
Currently includes environment.js for general environment settings
and soffice_args.js for soffice command line flags.
Change-Id: I1166c5a9ae53c56a69b9223c865b4df525d07450
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128590
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 2dd31741d3a0..ae2ba0620edb 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -11,6 +11,10 @@ gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive include $(GBUILDDIR)/platform/unxgcc.mk +# don't sort; later can override previous settings! +gb_EMSCRIPTEN_PRE_JS_FILES = \ + $(SRCDIR)/static/emscripten/environment.js \ + gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 @@ -53,6 +57,8 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.lib,%.worker.js,$(3)) \ ) +$(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call gb_Executable_add_prejs,$(1),$(pre_js))) + endef define gb_CppunitTest_CppunitTest_platform @@ -62,6 +68,8 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.lib,%.worker.js,$(3)) \ ) +$(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call gb_CppunitTest_add_prejs,$(1),$(pre_js))) + endef gb_SUPPRESS_TESTS := $(true) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index de3c2f8cc95a..b104ecc26b5b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -138,7 +138,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ -Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ - $(T_USE_LD) $(T_LDFLAGS) \ + $(T_USE_LD) $(T_LDFLAGS) $(foreach pre_js,$(T_PREJS), --pre-js $(pre_js)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ |