solenv/gbuild/platform/com_GCC_defs.mk | 3 ++-
solenv/gbuild/platform/unxgcc.mk | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 988d719cfbe097f674abfd04fdc4f9c2874b21b3
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Nov 8 15:18:40 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 28 15:33:19 2022 +0100
WASM gbuild: avoid annoying python warnings from emscripten
/home/builder/emsdk/upstream/emscripten/tools/building.py:1228:
ResourceWarning: unclosed file <_io.BufferedReader
name='/data/lo/build_feature_wasm/workdir/LinkTarget/StaticLibrary/libdtoa.a'>
header = open(filename, 'rb').read(8)
ResourceWarning: Enable tracemalloc to get the object allocation traceback
Change-Id: I5cd052cd47af92e18cb6ccce31d4503a322d815b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143389
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 87231a57196f..7a2066a60a24 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -277,7 +277,8 @@ 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
-gb_COMPILER_SETUP += CCACHE_CPP2=1
+# clear PYTHONWARNINGS to prevent noise from emscripten implementation
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
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
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b3388eec436a..cc377a5b4309 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,6 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ; \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date
-u),$(true),LNK,5)" ; \
)
+ $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
$(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX))
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
@@ -186,6 +187,7 @@ endef
define gb_LinkTarget__command_staticlink
$(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
+ $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
$(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
