diff options
Diffstat (limited to 'solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk')
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 7 |
1 files changed, 1 insertions, 6 deletions
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 |