solenv/gbuild/platform/com_MSC_defs.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit c00b2c43c8f10755b1e7bfb32766e384d8964b3d Author: Luboš Luňák <l.lu...@centrum.cz> AuthorDate: Sun Nov 28 19:11:50 2021 +0100 Commit: Luboš Luňák <l.lu...@collabora.com> CommitDate: Mon Nov 29 13:52:51 2021 +0100 clang-cl says it doesn't know -Zc:inline Change-Id: I2ace3011a533978d995898ed2dd588c728bac233 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126022 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lu...@collabora.com> diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 7760cefcab8a..892fa3867ba8 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -132,7 +132,6 @@ gb_CXXFLAGS := \ -Gs \ -GS \ -Gy \ - -Zc:inline \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ -nologo \ -W4 \ @@ -148,7 +147,10 @@ gb_CXXFLAGS := \ -wd4706 \ -bigobj \ +ifneq ($(COM_IS_CLANG),TRUE) +gb_CXXFLAGS += -Zc:inline gb_CXXFLAGS_ZCINLINE_OFF := -Zc:inline- +endif ifeq ($(CPUNAME),INTEL)