From 3bf9bee398397b63d920bbcc782b6fbdbbc778a1 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 17 Oct 2022 16:37:03 +0200 Subject: [PATCH] [android] Add --host flags to triplets (#27246) --- triplets/community/arm-android.cmake | 1 + triplets/community/arm-neon-android.cmake | 1 + triplets/community/arm64-android.cmake | 1 + triplets/community/x64-android.cmake | 1 + triplets/community/x86-android.cmake | 1 + 5 files changed, 5 insertions(+) diff --git a/triplets/community/arm-android.cmake b/triplets/community/arm-android.cmake index 29ba5655ae..feb8f186b7 100644 --- a/triplets/community/arm-android.cmake +++ b/triplets/community/arm-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") diff --git a/triplets/community/arm-neon-android.cmake b/triplets/community/arm-neon-android.cmake index 29ba5655ae..feb8f186b7 100644 --- a/triplets/community/arm-neon-android.cmake +++ b/triplets/community/arm-neon-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") diff --git a/triplets/community/arm64-android.cmake b/triplets/community/arm64-android.cmake index 20b255d392..46ad5f166a 100644 --- a/triplets/community/arm64-android.cmake +++ b/triplets/community/arm64-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") diff --git a/triplets/community/x64-android.cmake b/triplets/community/x64-android.cmake index 6342ce5361..7ef27c2b80 100644 --- a/triplets/community/x64-android.cmake +++ b/triplets/community/x64-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") diff --git a/triplets/community/x86-android.cmake b/triplets/community/x86-android.cmake index ca0fbaeffb..f909598cb3 100644 --- a/triplets/community/x86-android.cmake +++ b/triplets/community/x86-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android")