Streamline CMake cache for x64

Author: weliveindetail

cmake/caches/Windows-x86_64.cmake

@@ -27,49 +27,52 @@ set(LLVM_APPEND_VC_REV NO CACHE BOOL "")
 set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR YES CACHE BOOL "")
 set(LLVM_ENABLE_PYTHON YES CACHE BOOL "")
 
-set(default_targets
-      x86_64-unknown-windows-msvc
-      aarch64-unknown-windows-msvc
-      i686-unknown-windows-msvc)
-set(LLVM_RUNTIME_TARGETS ${default_targets} CACHE STRING "")
-
-# Build the android builtins if NDK path is provided.
-if(NOT "$ENV{NDKPATH}" STREQUAL "")
-  list(APPEND default_targets
-       aarch64-unknown-linux-android
-       x86_64-unknown-linux-android
-       i686-unknown-linux-android
-       armv7-unknown-linux-androideabi)
+if("$ENV{NDKPATH}" STREQUAL "")
+  set(LLVM_RUNTIME_TARGETS
+        x86_64-unknown-windows-msvc
+        aarch64-unknown-windows-msvc
+        i686-unknown-windows-msvc
+      CACHE STRING "")
+else()
+  # Keep API level in sync with build.ps1
+  set(CMAKE_ANDROID_API 28 CACHE BOOL "")
+  set(LLVM_RUNTIME_TARGETS
+        x86_64-unknown-windows-msvc
+        aarch64-unknown-windows-msvc
+        i686-unknown-windows-msvc
+        x86_64-unknown-linux-android
+        aarch64-unknown-linux-android
+        i686-unknown-linux-android
+        armv7-unknown-linux-androideabi
+      CACHE STRING "")
 endif()
 
-set(LLVM_BUILTIN_TARGETS ${default_targets} CACHE STRING "")
-
 foreach(target ${LLVM_RUNTIME_TARGETS})
-  set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES
-        compiler-rt
-      CACHE STRING "")
+  # We configure all runtimes, but don't build them yet. build.ps1 has a
+  # separate step for it, because we need a different shell for each target.
   set(RUNTIMES_${target}_CMAKE_MT mt CACHE STRING "")
   set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
   set(RUNTIMES_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
-  set(RUNTIMES_${target}_COMPILER_RT_BUILD_BUILTINS NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_CRT NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_LIBFUZZER NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_ORC NO CACHE BOOL "")
-  set(RUNTIMES_${target}_COMPILER_RT_BUILD_PROFILE NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_XRAY NO CACHE BOOL "")
-  # Sanitizers will be configured, but not built. We have separate build
-  # steps for that, because we need a different shell for each target.
+  set(RUNTIMES_${target}_COMPILER_RT_BUILD_PROFILE NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_SANITIZERS NO CACHE BOOL "")
-endforeach()
 
-foreach(target ${LLVM_BUILTIN_TARGETS})
+  # Configure and build builtins for all targets
   set(BUILTINS_${target}_CMAKE_MT mt CACHE STRING "")
+  set(BUILTINS_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
   if(${target} MATCHES windows-msvc)
     set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
   elseif(${target} MATCHES linux-android)
+    set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Android CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_ANDROID_API ${CMAKE_ANDROID_API} CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_C_COMPILER_TARGET "${target}${CMAKE_ANDROID_API}" CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_CXX_COMPILER_TARGET "${target}${CMAKE_ANDROID_API}" CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_ANDROID_NDK $ENV{NDKPATH} CACHE PATH "")
     # Use a single 'linux' directory and arch-based lib names on Android.
     set(BUILTINS_${target}_LLVM_ENABLE_PER_TARGET_RUNTIME_DIR NO CACHE BOOL "")
-    set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Android CACHE STRING "")
     if(${target} MATCHES aarch64)
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI arm64-v8a CACHE STRING "")
     elseif(${target} MATCHES armv7)
@@ -79,12 +82,7 @@ foreach(target ${LLVM_BUILTIN_TARGETS})
     else()
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
     endif()
-    set(BUILTINS_${target}_CMAKE_ANDROID_NDK $ENV{NDKPATH} CACHE PATH "")
-    set(BUILTINS_${target}_CMAKE_ANDROID_API 21 CACHE STRING "")
-    set(BUILTINS_${target}_CMAKE_C_COMPILER_TARGET "${target}21" CACHE STRING "")
-    set(BUILTINS_${target}_CMAKE_CXX_COMPILER_TARGET "${target}21" CACHE STRING "")
   endif()
-  set(BUILTINS_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
 endforeach()
 
 set(LLVM_TARGETS_TO_BUILD AArch64 ARM WebAssembly X86 CACHE STRING "")