diff options
| author | Max Kellermann <max@musicpd.org> | 2021-08-06 17:30:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-08-06 17:30:47 +0200 |
| commit | b0e95388554eeef78e3e3c4c6eb401b297b7603b (patch) | |
| tree | cae3a2c08b18270b1343e5858c24dd30fbe59ff2 | |
| parent | 694debd4cc7f13e70da78ee0b6eb85745620e099 (diff) | |
build/openssl: pass --cross-compile-prefix to ./Configure
| -rwxr-xr-x | android/build.py | 3 | ||||
| -rw-r--r-- | python/build/openssl.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/android/build.py b/android/build.py index eb6600111..664bcccdd 100755 --- a/android/build.py +++ b/android/build.py @@ -91,8 +91,9 @@ class AndroidNdkToolchain: self.arch = arch 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_triple = abi_info['llvm_triple'] + android_api_level diff --git a/python/build/openssl.py b/python/build/openssl.py index ecf88d4e2..605a04c74 100644 --- a/python/build/openssl.py +++ b/python/build/openssl.py @@ -48,6 +48,7 @@ class OpenSSLProject(MakeProject): } openssl_arch = openssl_archs[toolchain.arch] + cross_compile_prefix = toolchain.toolchain_arch + '-' subprocess.check_call(['./Configure', 'no-shared', @@ -56,6 +57,7 @@ class OpenSSLProject(MakeProject): 'no-tests', 'no-asm', # "asm" causes build failures on Windows openssl_arch, + '--cross-compile-prefix=' + cross_compile_prefix, '--prefix=' + toolchain.install_prefix], cwd=src, env=toolchain.env) MakeProject.build(self, toolchain, src) |