Merge pull request #22428 from drodriguez/fix-android-host-compiler-usage

[cmake] Recover original CMAKE_C/CXX_COMPILER after changing them.

Author: compnerd

stdlib/public/Reflection/CMakeLists.txt

@@ -34,6 +34,8 @@ if(SWIFT_INCLUDE_TOOLS)
   endif()
 
   if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
+    set(CURRENT_CMAKE_C_COMPILER ${CMAKE_C_COMPILER})
+    set(CURRENT_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
     set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
     set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
   endif()
@@ -44,5 +46,9 @@ if(SWIFT_INCLUDE_TOOLS)
     ${SWIFT_RUNTIME_CXX_FLAGS})
   set_property(TARGET swiftReflection
     APPEND_STRING PROPERTY LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS})
-endif()
 
+  if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
+    set(CMAKE_C_COMPILER ${CURRENT_CMAKE_C_COMPILER})
+    set(CMAKE_CXX_COMPILER ${CURRENT_CMAKE_CXX_COMPILER})
+  endif()
+endif()

stdlib/public/SwiftRemoteMirror/CMakeLists.txt

@@ -22,6 +22,8 @@ if(SWIFT_INCLUDE_TOOLS)
   endif()
 
   if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
+    set(CURRENT_CMAKE_C_COMPILER ${CMAKE_C_COMPILER})
+    set(CURRENT_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
     set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
     set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
   endif()
@@ -32,5 +34,9 @@ if(SWIFT_INCLUDE_TOOLS)
     ${SWIFT_RUNTIME_CXX_FLAGS})
   set_property(TARGET swiftRemoteMirror APPEND_STRING PROPERTY LINK_FLAGS
     ${SWIFT_RUNTIME_LINK_FLAGS})
-endif()
 
+  if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
+    set(CMAKE_C_COMPILER ${CURRENT_CMAKE_C_COMPILER})
+    set(CMAKE_CXX_COMPILER ${CURRENT_CMAKE_CXX_COMPILER})
+  endif()
+endif()