Issue #1316 - Reduce compiler warnings in ICU

This add a few disabled compiler warnings to the compiler flags on MSVC
and specifically filters out the RTTI disabling CL flag to prevent CLI
override warnings.

This resolves #1316
This commit is contained in:
wolfbeast 2019-12-19 17:40:52 +01:00 committed by Roy Tam
commit fac859839e
3 changed files with 35 additions and 0 deletions

12
config/external/icu/common/Makefile.in vendored Normal file
View file

@ -0,0 +1,12 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
ifdef _MSC_VER
CXXFLAGS := $(filter-out -GR-,$(CXXFLAGS))
CFLAGS := $(filter-out -GR-,$(CFLAGS))
endif

View file

@ -47,3 +47,14 @@ if CONFIG['CLANG_CL']:
'-Wno-macro-redefined',
'-Wno-microsoft-include',
]
if CONFIG['_MSC_VER'] and not CONFIG['CLANG_CL']:
CFLAGS += [
'-wd4005', # 'WIN32_LEAN_AND_MEAN' : macro redefinition
'-wd4996', # The compiler encountered a deprecated declaration.
]
CXXFLAGS += [
'-wd4005', # 'WIN32_LEAN_AND_MEAN' : macro redefinition
'-wd4333', # '>>' : right shift by too large amount, data loss
'-wd4996', # The compiler encountered a deprecated declaration.
]

12
config/external/icu/i18n/Makefile.in vendored Normal file
View file

@ -0,0 +1,12 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
ifdef _MSC_VER
CXXFLAGS := $(filter-out -GR-,$(CXXFLAGS))
CFLAGS := $(filter-out -GR-,$(CFLAGS))
endif