Don't unset CMAKE_CROSSCOMPILING when cross-compiling to linux (#37734)

microsoft · Jul 11, 2024 · 3f530d4 · 3f530d4
1 parent 4de4372
commit 3f530d4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake
@@ -21,9 +21,6 @@ if(NOT _VCPKG_LINUX_TOOLCHAIN)
         VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE VCPKG_LINKER_FLAGS_DEBUG
     )
 
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-        set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
-    endif()
     set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
        set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
@@ -70,6 +67,10 @@ if(NOT _VCPKG_LINUX_TOOLCHAIN)
         endif()
     endif()
 
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
+        set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
+    endif()
+
     string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
     string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
     string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")