diff options
| author | Luboš Luňák <l.lunak@centrum.cz> | 2021-11-28 19:11:50 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-11-29 13:52:51 +0100 |
| commit | c00b2c43c8f10755b1e7bfb32766e384d8964b3d (patch) | |
| tree | 256984228cc761fdcc57c9512742a6afd6616d7d /solenv | |
| parent | d4f1531b6d37153384e5a439dab6ab11ae3022ef (diff) | |
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.lunak@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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) |