diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 1 |
5 files changed, 1 insertions, 19 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index efdba146f6c4..5bb6ea5d66e9 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -534,6 +534,5 @@ gb_CppunitTest_use_clang = $(call gb_CppunitTest__forward_to_Linktarget,$(0),$(1 gb_CppunitTest_set_clang_precompiled_header = $(call gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_CppunitTest_use_vclmain = $(call gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_CppunitTest_add_prejs = $(call gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_CppunitTest_add_shellhtml = $(call gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3)) # vim: set noet sw=4: diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 57fe1525570c..7c8cf199496d 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -159,7 +159,6 @@ gb_Executable_use_clang = $(call gb_Executable__forward_to_Linktarget,$(0),$(1), gb_Executable_set_clang_precompiled_header = $(call gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_Executable_use_vclmain = $(call gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_Executable_add_prejs = $(call gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_Executable_add_shellhtml = $(call gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3)) # Run-time use diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 25d33abd52d6..85139659c634 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1071,7 +1071,6 @@ $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(USE_LD) $(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(gb_LTOFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_PREJS := -$(call gb_LinkTarget_get_target,$(1)) : T_SHELLHTML := ifeq ($(gb_FULLDEPS),$(true)) ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD)) @@ -2272,13 +2271,4 @@ endif endef -# call gb_LinkTarget_add_shellhtml,linktarget,js_file -define gb_LinkTarget_add_shellhtml -ifeq (EMSCRIPTEN,$(OS)) -$(call gb_LinkTarget_get_target,$(1)) : T_SHELLHTML += $(2) -$(call gb_LinkTarget_get_target,$(1)) : $(2) -endif - -endef - # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 656ade720823..5117225cff66 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -16,9 +16,6 @@ gb_EMSCRIPTEN_PRE_JS_FILES = \ $(SRCDIR)/static/emscripten/environment.js \ $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link \ -gb_EMSCRIPTEN_SHELL_HTML_FILE = \ - $(SRCDIR)/static/emscripten/soffice.html \ - 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 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE @@ -29,7 +26,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","allocateUTF8","printErr","ccall","cwrap","FS"] +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","allocateUTF8","printErr","ccall","cwrap"] gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB gb_Executable_EXT := .html @@ -90,7 +87,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ ) $(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call gb_Executable_add_prejs,$(1),$(pre_js))) -$(foreach shell_html,$(gb_EMSCRIPTEN_SHELL_HTML_FILE),$(call gb_Executable_add_shellhtml,$(1),$(shell_html))) endef @@ -103,7 +99,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ ) $(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call gb_CppunitTest_add_prejs,$(1),$(pre_js))) -$(foreach shell_html,$(gb_EMSCRIPTEN_SHELL_HTML_FILE),$(call gb_CppunitTest_add_shellhtml,$(1),$(shell_html))) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 24d357f78986..d00b657b5d6f 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -143,7 +143,6 @@ $(call gb_Helper_abbreviate_dirs,\ -Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ $(T_USE_LD) $(T_LDFLAGS) $(foreach pre_js,$(T_PREJS), --pre-js $(pre_js)) \ - $(T_USE_LD) $(T_LDFLAGS) $(foreach shell_html,$(T_SHELLHTML), --shell-file $(shell_html)) \ $(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))) \ |