mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-23 11:42:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move object file handling out of create_c_file()

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:11:53 +02:00 committed by Gilles Peskine
parent 0671dd3107
commit 46d894925d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/mbedtls_dev/c_build_helper.py
View File

@ -45,11 +45,9 @@ def create_c_file(file_label):
suffix='.c') suffix='.c')
exe_suffix = '.exe' if platform.system() == 'Windows' else '' exe_suffix = '.exe' if platform.system() == 'Windows' else ''
exe_name = c_name[:-2] + exe_suffix exe_name = c_name[:-2] + exe_suffix
obj_name = c_name[:-2] + '.obj'
remove_file_if_exists(exe_name) remove_file_if_exists(exe_name)
remove_file_if_exists(obj_name)
c_file = os.fdopen(c_fd, 'w', encoding='ascii') c_file = os.fdopen(c_fd, 'w', encoding='ascii')
return c_file, c_name, exe_name, obj_name return c_file, c_name, exe_name
def generate_c_printf_expressions(c_file, cast_to, printf_format, expressions): def generate_c_printf_expressions(c_file, cast_to, printf_format, expressions):
"""Generate C instructions to print the value of ``expressions``. """Generate C instructions to print the value of ``expressions``.
@ -124,8 +122,9 @@ def get_c_expression_values(
include_path = [] include_path = []
c_name = None c_name = None
exe_name = None exe_name = None
obj_name = None
try: try:
c_file, c_name, exe_name, obj_name = create_c_file(file_label) c_file, c_name, exe_name = create_c_file(file_label)
generate_c_file( generate_c_file(
c_file, caller, header, c_file, caller, header,
lambda c_file: generate_c_printf_expressions(c_file, lambda c_file: generate_c_printf_expressions(c_file,
@ -149,6 +148,7 @@ def get_c_expression_values(
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'
cmd += ['-Fe' + exe_name, '-Fo' + obj_name] cmd += ['-Fe' + exe_name, '-Fo' + obj_name]
else: else:
cmd += ['-o' + exe_name] cmd += ['-o' + exe_name]