diff options
| -rw-r--r-- | cppuhelper/Library_cppuhelper.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 3c87054b45ab..5e131cb6c43e 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -12,6 +12,8 @@ $(eval $(call gb_Library_Library,cppuhelper)) $(eval $(call gb_Library_set_soversion_script,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3.map)) +$(eval $(call gb_Library_set_precompiled_header,cppuhelper,cppuhelper/inc/pch/precompiled_cppuhelper)) + $(eval $(call gb_Library_use_internal_comprehensive_api,cppuhelper,\ cppuhelper \ udkapi \ @@ -24,8 +26,6 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\ -DCPPUHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_set_precompiled_header,cppuhelper,cppuhelper/inc/pch/precompiled_cppuhelper)) - $(eval $(call gb_Library_use_libraries,cppuhelper,\ cppu \ reg \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 29924c9897e0..91dc20adc72f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -2015,6 +2015,7 @@ endef # gb_LinkTarget_use_vclmain # break public ABI. # call gb_LinkTarget_set_is_ure_library,linktarget,,linktargetmakefilename define gb_LinkTarget_set_is_ure_library +$(call gb_LinkTarget_add_cxxflags,$(1),$(gb_CXXFLAGS_ZCINLINE_OFF)) ifeq ($(HAVE_DLLEXPORTINLINES),TRUE) $(call gb_LinkTarget_add_cxxflags,$(1),-Zc:dllexportInlines) endif diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 80944fe70ba4..3ea82e6c4936 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -48,9 +48,10 @@ endef # Avoid annoying warning D9025 about overriding command-line arguments. gb_Helper_remove_overridden_flags = \ $(lastword $(filter -W4 -w,$(1))) \ - $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)) \ + $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 -Zc:inline -Zc:inline- -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)) \ $(lastword $(filter -Od -O2,$(1))) \ $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) \ + $(lastword $(filter -Zc:inline -Zc:inline-,$(1))) \ $(lastword $(filter -Zc:dllexportInlines -Zc:dllexportInlines-,$(1))) # $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins,symbols,compiler) diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 273e17ea71f0..8dccadd1f743 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -133,6 +133,7 @@ gb_CXXFLAGS := \ -Gs \ -GS \ -Gy \ + -Zc:inline \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ -nologo \ -W4 \ @@ -148,6 +149,8 @@ gb_CXXFLAGS := \ -wd4706 \ -bigobj \ +gb_CXXFLAGS_ZCINLINE_OFF := -Zc:inline- + ifeq ($(CPUNAME),INTEL) gb_CXXFLAGS += \ |