Rename psa_crypto_lib_filename to just crypto_lib_filename

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-08-23 16:21:40 +01:00
parent 4dcddcfae2
commit 7f93d22ad9

View File

@ -87,10 +87,10 @@ def main(library_build_dir: str):
os.chdir(build_dir) os.chdir(build_dir)
if is_psa_crypto: if is_psa_crypto:
psa_crypto_lib_filename = \ crypto_lib_filename = \
library_build_dir + '/core/libpsacrypto.a' library_build_dir + '/core/libpsacrypto.a'
else: else:
psa_crypto_lib_filename = library_build_dir + '/library/libmbedcrypto.a' crypto_lib_filename = library_build_dir + '/library/libmbedcrypto.a'
extra_includes = (';{}/drivers/builtin/include'.format(mbedtls_dir) extra_includes = (';{}/drivers/builtin/include'.format(mbedtls_dir)
if is_psa_crypto else '') if is_psa_crypto else '')
@ -103,7 +103,7 @@ def main(library_build_dir: str):
'-DTOOLCHAIN=HOST_GCC', '-DTOOLCHAIN=HOST_GCC',
'-DSUITE=CRYPTO', '-DSUITE=CRYPTO',
'-DPSA_CRYPTO_LIB_FILENAME={}/{}'.format(mbedtls_dir, '-DPSA_CRYPTO_LIB_FILENAME={}/{}'.format(mbedtls_dir,
psa_crypto_lib_filename), crypto_lib_filename),
('-DPSA_INCLUDE_PATHS={}/include' + extra_includes).format(mbedtls_dir) ('-DPSA_INCLUDE_PATHS={}/include' + extra_includes).format(mbedtls_dir)
]) ])
subprocess.check_call(['cmake', '--build', '.']) subprocess.check_call(['cmake', '--build', '.'])