compilerplugins/Makefile-clang.mk | 2 +- jurt/Library_jpipe.mk | 4 ++-- setup_native/Library_getuid.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 1772daba6afa394e1081028825e4f96e6387d9a3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 16 11:37:02 2017 +0200 Also filter out flags like -fsanitize-address-globals-dead-stripping ...to avoid -Werror,-Wunused-command-line-argument in case some ASan build setting passes in such flags Change-Id: Ia613a10e3564a23715019ee0c7c755cdcbf7a47c diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index dc9255725b9e..4839fdef2feb 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -11,7 +11,7 @@ CLANG_COMMA :=, ifeq ($(COMPILER_PLUGINS_CXX),) -CLANGCXX=$(filter-out -m32 -m64 -fsanitize=%,$(CXX)) +CLANGCXX=$(filter-out -m32 -m64 -fsanitize%,$(CXX)) else CLANGCXX=$(COMPILER_PLUGINS_CXX) endif diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 2e26df17e13d..5759baed5175 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -79,9 +79,9 @@ $(eval $(call gb_Library_add_libs,jpipe, \ )) $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \ - gb_CC := $(filter-out -fsanitize=%,$(gb_CC)) + gb_CC := $(filter-out -fsanitize%,$(gb_CC)) $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \ - gb_CXX := $(filter-out -fsanitize=%,$(gb_CXX)) + gb_CXX := $(filter-out -fsanitize%,$(gb_CXX)) endif endif diff --git a/setup_native/Library_getuid.mk b/setup_native/Library_getuid.mk index 650cfaf1897b..4212e5f4b4d5 100644 --- a/setup_native/Library_getuid.mk +++ b/setup_native/Library_getuid.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Library_add_defs,getuid,\ )) endif -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,getuid)) : gb_CC := $(filter-out -fsanitize=%,$(gb_CC)) +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,getuid)) : gb_CC := $(filter-out -fsanitize%,$(gb_CC)) # the library is used by LD_PRELOAD; make sure that we see the symbols ;-) ifeq ($(COM),GCC) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits