cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove caching of cc_is_msvc

Browse Source 
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-05-12 10:28:30 +02:00 committed by Gilles Peskine
parent 7c18550383
commit 539f1432cd
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mbedtls_dev/c_build_helper.py
View File

@ -89,7 +89,6 @@ int main(void)
} }
''') ''')
_cc_is_msvc = None #pylint: disable=invalid-name
def get_c_expression_values( def get_c_expression_values(
cast_to, printf_format, cast_to, printf_format,
expressions, expressions,
@ -113,9 +112,6 @@ def get_c_expression_values(
to ``cc``. If ``CC`` looks like MSVC, use its command line syntax, to ``cc``. If ``CC`` looks like MSVC, use its command line syntax,
otherwise assume the compiler supports Unix traditional ``-I`` and ``-o``. otherwise assume the compiler supports Unix traditional ``-I`` and ``-o``.
NOTE: This function only checks the identity of the compiler referred to by
``CC`` on its first invocation, and caches the result.
Return the list of values of the ``expressions``. Return the list of values of the ``expressions``.
""" """
if include_path is None: if include_path is None:
@ -135,17 +131,15 @@ def get_c_expression_values(
cc = os.getenv('CC', 'cc') cc = os.getenv('CC', 'cc')
cmd = [cc] cmd = [cc]
global _cc_is_msvc #pylint: disable=global-statement,invalid-name proc = subprocess.Popen(cmd,
if _cc_is_msvc is None: stdout=subprocess.DEVNULL,
proc = subprocess.Popen(cmd, stderr=subprocess.PIPE,
stdout=subprocess.DEVNULL, universal_newlines=True)
stderr=subprocess.PIPE, cc_is_msvc = 'Microsoft (R) C/C++ Optimizing Compiler' in \
universal_newlines=True) proc.communicate()[1]
_cc_is_msvc = 'Microsoft (R) C/C++ Optimizing Compiler' in \
proc.communicate()[1]
cmd += ['-I' + dir for dir in include_path] cmd += ['-I' + dir for dir in include_path]
if _cc_is_msvc: if cc_is_msvc:
# MSVC has deprecated using -o to specify the output file, # MSVC has deprecated using -o to specify the output file,
# and produces an object file in the working directory by default. # and produces an object file in the working directory by default.
obj_name = exe_name[:-4] + '.obj' obj_name = exe_name[:-4] + '.obj'