From: Dong-hee Na Date: Mon, 25 Jul 2022 19:10:30 +0000 (+0900) Subject: gh-85454: Remove distutils.ccompiler from Tools/c-analyzer (GH-95171) X-Git-Tag: v3.12.0a1~847 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a15ae19ffba33282d21440a8fb7c39af26b7d25e;p=thirdparty%2FPython%2Fcpython.git gh-85454: Remove distutils.ccompiler from Tools/c-analyzer (GH-95171) --- diff --git a/Tools/c-analyzer/c_parser/preprocessor/__init__.py b/Tools/c-analyzer/c_parser/preprocessor/__init__.py index e38176fee31f..c154137bf42f 100644 --- a/Tools/c-analyzer/c_parser/preprocessor/__init__.py +++ b/Tools/c-analyzer/c_parser/preprocessor/__init__.py @@ -1,7 +1,9 @@ import contextlib -import distutils.ccompiler import logging +import os import os.path +import re +import sys from c_common.fsutil import match_glob as _match_glob from c_common.tables import parse_table as _parse_table @@ -168,9 +170,17 @@ _COMPILERS = { } +def _get_default_compiler(): + if re.match('cygwin.*', sys.platform) is not None: + return 'unix' + if os.name == 'nt': + return 'msvc' + return 'unix' + + def _get_preprocessor(tool): if tool is True: - tool = distutils.ccompiler.get_default_compiler() + tool = _get_default_compiler() preprocess = _COMPILERS.get(tool) if preprocess is None: raise ValueError(f'unsupported tool {tool}')