diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-03 13:41:17 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-03 15:57:15 +0200 |
| commit | 3be1d4858db23c44de63f788a633be3a9bcf92a7 (patch) | |
| tree | 8651c8a50b33f73b08ab35b6d34127f17a773ce5 | |
| parent | 0e493cae407cca65f58329b3319d9c836cdf5096 (diff) | |
Don't use /NATVIS for static libraries
This avoids linker warnings:
LINK : warning LNK4044: unrecognized option
'/NATVIS:path/to/solenv/vs/LibreOffice.natvis'; ignored
Change-Id: I9cb0dee7a4f1b07e975371f122aa9c7dbba783e1
Reviewed-on: https://gerrit.libreoffice.org/52309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 8c0a23e9bf03..1dfa3b899ebf 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -178,6 +178,7 @@ $(call gb_Helper_abbreviate_dirs,\ -LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64 \ $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)) \ $(T_LDFLAGS) \ + $(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),/NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis) \ @$${RESPONSEFILE} \ $(foreach lib,$(sort $(LINKED_LIBS)),$(call gb_Library_get_ilibfilename,$(lib))) \ $(foreach lib,$(sort $(LINKED_STATIC_LIBS)),$(call gb_StaticLibrary_get_filename,$(lib))) \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b276f2d5329e..67fa66d511dc 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -241,7 +241,6 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) gb_LinkTarget_LDFLAGS := \ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \ $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \ - /NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis \ # Prevent warning spamming # Happens because of the way we link our unit tests with our libraries. |