ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-27 07:37:05 +08:00
Code Issues Releases Wiki Activity

Detect MSVC without relying on compiler filename

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

14
scripts/mbedtls_dev/c_build_helper.py
View File

@ -89,6 +89,7 @@ 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,
@ -128,11 +129,20 @@ def get_c_expression_values(
) )
c_file.close() c_file.close()
cc = os.getenv('CC', 'cc') cc = os.getenv('CC', 'cc')
cc_is_msvc = os.path.split(cc)[1].lower() in ('cl', 'cl.exe')
cmd = [cc] cmd = [cc]
global _cc_is_msvc #pylint: disable=global-statement,invalid-name
if _cc_is_msvc is None:
proc = subprocess.Popen(cmd,
stdout=subprocess.DEVNULL,
stderr=subprocess.PIPE,
universal_newlines=True)
_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]
# MSVC has deprecated using -o to specify the output file. # MSVC has deprecated using -o to specify the output file.
output_opt = '-Fe' if cc_is_msvc else '-o' output_opt = '-Fe' if _cc_is_msvc else '-o'
cmd += [output_opt + exe_name] cmd += [output_opt + exe_name]
subprocess.check_call(cmd + [c_name]) subprocess.check_call(cmd + [c_name])
if keep_c: if keep_c: