Merge remote-tracking branch 'grendel/dev/grendel/android-build-with-…

…ndk' into dev/grendel/android-build-with-ndk
dotnet · Jan 15, 2025 · 3831805 · 3831805
2 parents a515ed8 + c171ce3
commit 3831805
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake
@@ -21,33 +21,35 @@ macro(set_cache_value)
   set(${ARGV0}__TRYRUN_OUTPUT "dummy output" CACHE STRING "Output from TRY_RUN" FORCE)
 endmacro()
 
-if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/ppc64le-alpine-linux-musl OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl OR
-   EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
+if(NOT DEFINED ANDROID_PLATFORM)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/ppc64le-alpine-linux-musl OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl OR
+    EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
 
-  set(ALPINE_LINUX 1)
-elseif(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
-  set(FREEBSD 1)
-  set(CMAKE_SYSTEM_NAME FreeBSD)
-  set(CLR_CMAKE_TARGET_OS freebsd)
-elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
-  set(ILLUMOS 1)
-  set(CLR_CMAKE_TARGET_OS sunos)
-elseif(EXISTS /System/Library/CoreServices)
-  set(DARWIN 1)
-elseif(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
-  set(TIZEN 1)
-elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h)
-  set(HAIKU 1)
-  set(CLR_CMAKE_TARGET_OS haiku)
+    set(ALPINE_LINUX 1)
+  elseif(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
+    set(FREEBSD 1)
+    set(CMAKE_SYSTEM_NAME FreeBSD)
+    set(CLR_CMAKE_TARGET_OS freebsd)
+  elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
+    set(ILLUMOS 1)
+    set(CLR_CMAKE_TARGET_OS sunos)
+  elseif(EXISTS /System/Library/CoreServices)
+    set(DARWIN 1)
+  elseif(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
+    set(TIZEN 1)
+  elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h)
+    set(HAIKU 1)
+    set(CLR_CMAKE_TARGET_OS haiku)
+  endif()
 endif()
 
-if(DARWIN AND NOT DEFINED ANDROID_PLATFORM)
+if(DARWIN)
   if(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
     set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 1)
     set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1)