diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-30 15:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-30 15:22:38 +0200 |
| commit | 686611019fee67e130452ad0b4abe50647d948fb (patch) | |
| tree | f35824c3131b4803fc58d52b93f4419038e2e839 /solenv | |
| parent | 21f40d6f9460d378059d136afcdae3a56b98cb5d (diff) | |
move disabling of LNK4217
since it's Visual Studio specific, not Windows-specific
Change-Id: I740b392f1aa9ff9c534b0e2fe021de7f93495e4c
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 478726a055d3..6ff38809c064 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -262,6 +262,12 @@ gb_LinkTarget_LDFLAGS := \ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \ $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \ +# Prevent warning spamming +# Happens because of the way we link our unit tests with our libraries. +gb_LinkTarget_LDFLAGS += \ + /ignore:4217 + + gb_DEBUGINFO_FLAGS := -Zi ifeq ($(VCVER),120) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 42cb134028b3..a2e621d67215 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -50,9 +50,4 @@ gb_Executable_LAYER := \ # empty to avoid --warn-undefined-functions gb_Library__set_soversion_script_platform = -# Prevent warning spamming -# Happens because of the way we link our unit tests with our libraries. -gb_LinkTarget_LDFLAGS += \ - /ignore:4217 - # vim:set noexpandtab: |