diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 2fb98bcf622f..9894951d3260 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -268,6 +268,6 @@ gb_Library_use_clang = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$ gb_Library_set_clang_precompiled_header = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_Library_use_glxtest = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_Library_use_vclmain = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_Library_set_is_ure_library = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3)) +gb_Library_set_is_ure_library_or_dependency = $(call gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3)) # vim: set noet sw=4: diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index a5306eeb38b9..3b02bb635400 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -2099,8 +2099,12 @@ endef # gb_LinkTarget_use_vclmain # Used by URE libraries that need to keep binary compatibility. # Reset some flags that make sense for our internal libraries but might # break public ABI. -# call gb_LinkTarget_set_is_ure_library,linktarget,,linktargetmakefilename -define gb_LinkTarget_set_is_ure_library +# (clang-cl's -Zc:dllexportInlines- would not only be a problem for the URE libraries themselves but +# also for any libraries they depend on. While that does not appear to be a problem for -Zc:inline +# for neither MSVC nor clang-cl, it should not really hurt to also switch that off not only for the +# URE libraries themselves but also for their dependencies.) +# call gb_LinkTarget_set_is_ure_library_or_dependency,linktarget,,linktargetmakefilename +define gb_LinkTarget_set_is_ure_library_or_dependency $(call gb_LinkTarget_add_cxxflags,$(1),$(gb_CXXFLAGS_ZCINLINE_OFF)) ifeq ($(HAVE_DLLEXPORTINLINES),TRUE) $(call gb_LinkTarget_add_cxxflags,$(1),-Zc:dllexportInlines) |