diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-29 11:43:33 +0530 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2023-01-12 21:57:08 +0000 |
| commit | 3ad9be31b3b94675ee7ca937f94201a926b44769 (patch) | |
| tree | 6144cc096e7810b4d3333255fe58a3df7f8743de /config | |
| parent | c92700a19c5558455e14327f9c5920b6d07f18aa (diff) | |
android.config: Use versioned llvm-triples everywhere
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/864>
Diffstat (limited to 'config')
| -rw-r--r-- | config/android.config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/android.config b/config/android.config index 85cd332c..3808ae4e 100644 --- a/config/android.config +++ b/config/android.config @@ -49,7 +49,7 @@ if target_arch == Architecture.ARMv7: tools_dir = tools_prefix arch_include = tools_prefix host = 'arm-linux-androideabi' - llvm_triple = f'armv7-none-linux-androideabi{v}' + llvm_triple = f'armv7a-linux-androideabi{v}' _android_arch = 'arm' _cerbero_arch = 'armv7' _cxx_arch = 'armeabi-v7a' @@ -58,7 +58,7 @@ elif target_arch == Architecture.ARM64: tools_dir = tools_prefix arch_include = tools_prefix host = 'aarch64-linux-android' - llvm_triple = 'aarch64-none-linux-android' + llvm_triple = f'aarch64-linux-android{v}' _android_arch = 'arm64' _cerbero_arch = 'arm64' _cxx_arch = 'arm64-v8a' @@ -67,7 +67,7 @@ elif target_arch == Architecture.X86: tools_dir = 'x86' arch_include = tools_prefix host = 'i686-linux-android' - llvm_triple = "i686-none-linux-android" + llvm_triple = f'i686-linux-android{v}' _android_arch = 'x86' _cerbero_arch = 'x86' _cxx_arch = 'x86' @@ -75,7 +75,7 @@ elif target_arch == Architecture.X86_64: tools_prefix = 'x86_64-linux-android' tools_dir = 'x86_64' host = 'x86_64-linux-android' - llvm_triple = "x86_64-none-linux-android" + llvm_triple = f'x86_64-linux-android{v}' _android_arch = 'x86_64' _cerbero_arch = 'x86_64' _cxx_arch = 'x86_64' |