[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 55b095abcb655a9199be10243e2c6cf74d7e57f5 Author: Tor Lillqvist AuthorDate: Fri Dec 23 12:41:09 2022 +0200 Commit: Tor Lillqvist CommitDate: Fri Feb 24 07:56:02 2023 + Don't use symlinks for the Emscripten soffice.data and soffice.data.js.metadata Symlinks just complicate things. Disk space is cheap. soffice.data is under 100 megs even with Qt5. Note that after this you will need to clean out the existing soffice.data and soffice.data.js.metadata symlinks before you run make, otherwise you will get errors. As such, it is a bit weird that we unconditionally play around with soffice.data for *all* (non-CppunitTest) Executable targets. (Thus, for instance also for vcldemo and unoidl-read.) We should do this dance only for the soffice executable. And we should reduce the number of executables we build for Emscripten. Probably none other than soffice itself makes sense? Change-Id: I75f6719b92d83e88bf59d65c38aeeab47e0b29e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144781 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147560 Tested-by: Tor Lillqvist diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index f1cb77a63054..bfb860a41fc2 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -183,8 +183,8 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \ sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \ cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) ; \ ) \ -ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data ; \ -ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \ +cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data ; \ +cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \ ) endef
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit b7d19c5f2538507a0abae4e3b7c301b6f66f Author: Tor Lillqvist AuthorDate: Fri Dec 23 12:23:32 2022 +0200 Commit: Tor Lillqvist CommitDate: Fri Feb 24 07:55:38 2023 + Un-confuse Emscripten and Qt5 conditionals The embedded file system that we construct when building for Emscripten is not related to whether we use Qt5 or not. Change-Id: Ibf65cae06093d9130a19780c1116f8b9997c664b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144780 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147559 diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 461d1f048390..f1cb77a63054 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -178,11 +178,13 @@ $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\ | cut -d' ' -f1-2 >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp, \ $(WORKDIR)/LinkTarget/$(2).exports,$(1 -$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter EMSCRIPTEN,$(OS)),$(filter TRUE,$(ENABLE_QT5))), \ +$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter EMSCRIPTEN,$(OS))), \ +$(if $(filter TRUE,$(ENABLE_QT5)), \ +sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \ cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) ; \ -sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) ; \ +) \ ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data ; \ -ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata ; \ +ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \ ) endef
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4f07ec2d99c632356e3735400796ce4b823eb38d Author: Tor Lillqvist AuthorDate: Mon Feb 13 14:54:24 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:33:29 2023 + Use -O3 for Emscripten, seems to work Change-Id: I7effd75355ff81e6d4f85b1c6047c7656bfbb915 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147006 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147555 Tested-by: Tor Lillqvist diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 4ae925daf5d1..a69539b65403 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -71,6 +71,8 @@ ifeq ($(HAVE_EXTERNAL_DWARF),TRUE) gb_DEBUGINFO_FLAGS += -gseparate-dwarf endif +gb_COMPILEROPTFLAGS := -O3 + # We need at least code elimination, otherwise linking OOMs even with 64GB. # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for debug in configure. gb_COMPILERDEBUGOPTFLAGS := -O1
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 1 file changed, 4 insertions(+) New commits: commit 9fdb8d1230605ce57e4a2a8636b23005a22ea46a Author: Tor Lillqvist AuthorDate: Thu Feb 16 13:20:53 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:33:12 2023 + Add comment about using WASM exceptions Change-Id: I402bf56b89b3a18f854331915f827f7512fb05e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147152 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147554 diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index fa7b51e54cc4..4ae925daf5d1 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -32,6 +32,10 @@ gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO gb_Executable_EXT := .html ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE) +# Note that to really use WASM exceptions everywhere, you most probably want to also use +# CC=emcc -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s SUPPORT_LONGJMP=wasm +# and CXX=em++ -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s SUPPORT_LONGJMP=wasm +# in your autogen.input. Otherwise these flags won't propagate to all external libraries, I fear. gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions -s SUPPORT_LONGJMP=wasm gb_EMSCRIPTEN_CPPFLAGS += -s SUPPORT_LONGJMP=wasm else
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 502f5139dfa27e8ab61699a52ea3327309fafd2c Author: Tor Lillqvist AuthorDate: Tue Jan 24 17:19:27 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:29:33 2023 + Clarify comment Change-Id: I33d10ea4f3ca35619d6f857d18b5c53a22d822a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146097 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147526 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 3a14e841bc97..89e717ccd15a 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -280,7 +280,7 @@ endif # For Emscripten, the emcc command is a Python script that outputs annoying warnings like # .../emscripten/tools/building.py:638: ResourceWarning: unclosed file <_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' mode='w' encoding='utf-8'> -# into stderr, which makes the configure script think that there is a problem in +# into stderr, which makes a configure script think that there is a problem in # compiling even a microscopic test program with an option like -Werror which # surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit be06ff15ba720bc057b2192f4191b7f39f25b970 Author: Tor Lillqvist AuthorDate: Tue Jan 24 13:09:42 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:28:57 2023 + Use PYTHONWARNINGS=ignore instead of 'default' for Emscripten The Emscripten compiler, emcc is a Python script that wraps the actual compiler. It outputs annoying warnings like .../emscripten/tools/building.py:638: ResourceWarning: unclosed file <_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' mode='w' encoding='utf-8'> to stderr. (Ditto for em++.) Some steps in typical configure script think that a non-empty stderr means there was a problem in compiling a test program. This happens even for a microscopic test program with an option like -Werror which surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore. Change-Id: I11927fc7dccaa65a239ba65dfc7c6bb7487bf12d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146070 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147524 Tested-by: Tor Lillqvist diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 0cbe852539c9..3a14e841bc97 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -275,9 +275,16 @@ endif ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE) gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug endif -# set CCACHE_CPP2=1 to prevent clang generating spurious warnings -# clear PYTHONWARNINGS to prevent noise from emscripten implementation -gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default) + +# Set CCACHE_CPP2=1 to prevent Clang generating spurious warnings. + +# For Emscripten, the emcc command is a Python script that outputs annoying warnings like +# .../emscripten/tools/building.py:638: ResourceWarning: unclosed file <_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' mode='w' encoding='utf-8'> +# into stderr, which makes the configure script think that there is a problem in +# compiling even a microscopic test program with an option like -Werror which +# surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore. + +gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter EMSCRIPTEN,$(OS)),PYTHONWARNINGS=ignore) gb_COMPILER_PLUGINS_SETUP := ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \ -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 1efd43cf08dbe36474bbccc99c5097112dd12b4b Author: Tor Lillqvist AuthorDate: Mon Jan 23 17:02:07 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:27:45 2023 + Bin line that was commented-out in December 2021 Change-Id: Ie6c6891d1a682d57e4606454fb6b295072e57644 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146038 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147522 Tested-by: Tor Lillqvist diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index fdce92af0abe..fa7b51e54cc4 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -62,7 +62,6 @@ gb_LINKERSTRIPDEBUGFLAGS := # This maps to g3, no source maps, but DWARF with current emscripten! # https://developer.chrome.com/blog/wasm-debugging-2020/ gb_DEBUGINFO_FLAGS = -g -#gb_DEBUGINFO_FLAGS = -gsource-map --source-map-base=file://$(WORKDIR)/LinkTarget/Executable ifeq ($(HAVE_EXTERNAL_DWARF),TRUE) gb_DEBUGINFO_FLAGS += -gseparate-dwarf
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |8 1 file changed, 8 insertions(+) New commits: commit 5506fba4d5d0eccd08f0dcea1164acd51c1f1f95 Author: Tor Lillqvist AuthorDate: Mon Jan 16 23:16:53 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:26:57 2023 + Adapt for --enable-wasm-exceptions Actually, it seems that to build core with --fwasm-exceptions for use in a LibreOffice Technology -using WASM executable, you need to compile *everything* with that (i.e. *all* of core's externals). Just these gbuild things are not enough to ensure that. You have to put CC=emcc -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm CXX=em++ -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm into your autogen.input. Change-Id: I10d21ad0f73e7e5d72864864d595077bd770f4f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145646 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147521 diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 8831aeeb5d54..fdce92af0abe 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -39,7 +39,15 @@ gb_EMSCRIPTEN_EXCEPT = -s DISABLE_EXCEPTION_CATCHING=0 endif gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) + +ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE) +# Here we don't use += because gb_LinkTarget_EXCEPTIONFLAGS from com_GCC_defs.mk contains -fexceptions and +# gb_EMSCRIPTEN_EXCEPT already has -fwasm-exceptions +gb_LinkTarget_EXCEPTIONFLAGS = $(gb_EMSCRIPTEN_EXCEPT) +else gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT) +endif + gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT) ifeq ($(ENABLE_QT5),TRUE)
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 12 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit 378ea8aea5244ef419f3d0bb932125fa5c8b66a2 Author: Tor Lillqvist AuthorDate: Wed Jan 11 17:39:06 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:26:32 2023 + Use gb_EMSCRIPTEN_QTDEFS only when building with Qt5 Move -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE to gb_EMSCRIPTEN_CPPFLAGS. Change-Id: I435a8482e9d04d9c8218926865738397e2897109 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145354 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147520 Tested-by: Tor Lillqvist diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index b0629894a07e..8831aeeb5d54 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -18,7 +18,7 @@ gb_EMSCRIPTEN_PRE_JS_FILES = \ 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 +gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) # Initial memory size and worker thread pool @@ -28,7 +28,7 @@ gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4 # 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"] -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_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB gb_Executable_EXT := .html ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE) @@ -40,8 +40,12 @@ endif gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT) -gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS) -gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS) $(gb_EMSCRIPTEN_EXCEPT) +gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) +gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT) +ifeq ($(ENABLE_QT5),TRUE) +gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_QTDEFS) +gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_QTDEFS) +endif gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT) # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/gbuild solenv/inc
solenv/gbuild/platform/com_GCC_defs.mk |1 - solenv/gbuild/platform/com_MSC_defs.mk |1 - solenv/inc/doxygen.cfg |1 - solenv/inc/doxygen_doc.cfg |1 - solenv/inc/doxygen_tag.cfg |1 - 5 files changed, 5 deletions(-) New commits: commit fbd35ed547ed130e9846c0fbc1e8e6f08156a400 Author: Tor Lillqvist AuthorDate: Fri Jan 13 11:43:39 2023 +0200 Commit: Tor Lillqvist CommitDate: Thu Feb 23 18:24:39 2023 + EXCEPTIONS_ON has no meaning Change-Id: I0ca0dcb76d342b451879788b57da03fb7d79e699 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145456 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147518 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 6eeda2fc03ab..0cbe852539c9 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -205,7 +205,6 @@ endif endif gb_LinkTarget_EXCEPTIONFLAGS := \ - -DEXCEPTIONS_ON \ -fexceptions ifeq ($(gb_ENABLE_DBGUTIL),$(false)) diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 928fd3400af1..ad425e9b5fdd 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -206,7 +206,6 @@ gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX) gb_CXX03FLAGS := gb_LinkTarget_EXCEPTIONFLAGS := \ - -DEXCEPTIONS_ON \ -EHs \ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg index 2bdabc731935..ed50d426549e 100644 --- a/solenv/inc/doxygen.cfg +++ b/solenv/inc/doxygen.cfg @@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \ DBG_UTIL \ OSL_DEBUG_LEVEL=2 \ CUI \ - EXCEPTIONS_ON \ DOXYGEN_ONLY # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/solenv/inc/doxygen_doc.cfg b/solenv/inc/doxygen_doc.cfg index dfcf174ee559..78d2778f7a4b 100644 --- a/solenv/inc/doxygen_doc.cfg +++ b/solenv/inc/doxygen_doc.cfg @@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \ DBG_UTIL \ OSL_DEBUG_LEVEL=2 \ CUI \ - EXCEPTIONS_ON \ DOXYGEN_ONLY # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/solenv/inc/doxygen_tag.cfg b/solenv/inc/doxygen_tag.cfg index a2f2e602612b..1ba9c17cdbfc 100644 --- a/solenv/inc/doxygen_tag.cfg +++ b/solenv/inc/doxygen_tag.cfg @@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \ DBG_UTIL \ OSL_DEBUG_LEVEL=2 \ CUI \ - EXCEPTIONS_ON \ DOXYGEN_ONLY # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
