oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

build/openssl: pass --cross-compile-prefix to ./Configure

This commit is contained in:
Max Kellermann 2021-08-06 17:30:45 +02:00
parent 694debd4cc
commit b0e9538855
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/build.py
View File

@ -91,8 +91,9 @@ class AndroidNdkToolchain:
self.arch = arch self.arch = arch
self.install_prefix = install_prefix self.install_prefix = install_prefix
self.toolchain_arch = abi_info['toolchain_arch']
toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch) toolchain_path = os.path.join(ndk_path, 'toolchains', self.toolchain_arch + '-' + gcc_version, 'prebuilt', build_arch)
llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch) llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
llvm_triple = abi_info['llvm_triple'] + android_api_level llvm_triple = abi_info['llvm_triple'] + android_api_level

2
python/build/openssl.py
View File

@ -48,6 +48,7 @@ class OpenSSLProject(MakeProject):
} }
openssl_arch = openssl_archs[toolchain.arch] openssl_arch = openssl_archs[toolchain.arch]
cross_compile_prefix = toolchain.toolchain_arch + '-'
subprocess.check_call(['./Configure', subprocess.check_call(['./Configure',
'no-shared', 'no-shared',
@ -56,6 +57,7 @@ class OpenSSLProject(MakeProject):
'no-tests', 'no-tests',
'no-asm', # "asm" causes build failures on Windows 'no-asm', # "asm" causes build failures on Windows
openssl_arch, openssl_arch,
'--cross-compile-prefix=' + cross_compile_prefix,
'--prefix=' + toolchain.install_prefix], '--prefix=' + toolchain.install_prefix],
cwd=src, env=toolchain.env) cwd=src, env=toolchain.env)
MakeProject.build(self, toolchain, src) MakeProject.build(self, toolchain, src)