diff options
| -rwxr-xr-x | configure.py | 8 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 35be81a73..817d0f914 100755 --- a/configure.py +++ b/configure.py @@ -469,6 +469,9 @@ def process_command_line(args): # pylint: disable=too-many-locals build_group.add_option('--with-debug-asserts', action='store_true', default=False, help=optparse.SUPPRESS_HELP) + build_group.add_option('--ack-vc2013-deprecated', action='store_true', default=False, + help=optparse.SUPPRESS_HELP) + docs_group = optparse.OptionGroup(parser, 'Documentation Options') docs_group.add_option('--with-documentation', action='store_true', @@ -2933,7 +2936,10 @@ def calculate_cc_min_version(options, ccinfo, source_paths): if ccinfo.basename == 'msvc': if major_version == 18: - logging.warning('MSVC 2013 support is deprecated and will be removed in a future release') + logging.warning('MSVC 2013 support is deprecated, and will be removed in Jan 2019') + if not options.ack_vc2013_deprecated: + logging.error('Acknowledge this deprecation by adding flag --ack-vc2013-deprecated') + return cc_version def check_compiler_arch(options, ccinfo, archinfo, source_paths): diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 65f62762d..3c2cb49f5 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -59,6 +59,9 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro '--cc=%s' % (target_cc), '--os=%s' % (target_os)] + if target_cc == 'msvc': + flags += ['--ack-vc2013-deprecated'] + if target_cpu != None: flags += ['--cpu=%s' % (target_cpu)] |