Move VCPKG_MAKE_BUILD_TRIPLET to android triplet file

microsoft · Sep 10, 2022 · 4186327 · 4186327
1 parent 68936ca
commit 4186327
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
@@ -470,14 +470,6 @@ function(vcpkg_configure_make)
         endif()
     endif()
 
-    # Android - cross-compiling support
-    if(VCPKG_TARGET_IS_ANDROID)
-        if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET)
-            set(arg_BUILD_TRIPLET "--host=${VCPKG_MAKE_BUILD_TRIPLET}")
-            debug_message("Using make triplet: ${arg_BUILD_TRIPLET}")
-        endif()
-    endif()
-
     # Cleanup previous build dirs
     file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
                         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"

diff --git a/triplets/community/arm-android.cmake b/triplets/community/arm-android.cmake
@@ -2,4 +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 armv7a-linux-androideabi)
+set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
diff --git a/triplets/community/arm64-android.cmake b/triplets/community/arm64-android.cmake
@@ -2,4 +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 aarch64-linux-android)
+set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android")
diff --git a/triplets/community/x64-android.cmake b/triplets/community/x64-android.cmake
@@ -2,4 +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 x86_64-linux-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
@@ -2,4 +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 i686-linux-android)
+set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android")