Index: cmake/builtin-config-ix.cmake
===================================================================
--- cmake/builtin-config-ix.cmake
+++ cmake/builtin-config-ix.cmake
@@ -89,15 +89,15 @@
   # We're setting the flag manually for each target OS
   set(CMAKE_OSX_DEPLOYMENT_TARGET "")
 
-  if(NOT DARWIN_osx_ARCHS)
-    set(DARWIN_osx_ARCHS i386 x86_64 x86_64h)
+  if(NOT DARWIN_osx_ARCHS_builtin)
+    set(DARWIN_osx_ARCHS_builtin i386 x86_64 x86_64h)
   endif()
 
-  set(DARWIN_sim_ARCHS i386 x86_64)
-  set(DARWIN_device_ARCHS armv7 armv7s armv7k arm64)
+  set(DARWIN_sim_ARCHS_builtin i386 x86_64)
+  set(DARWIN_device_ARCHS_builtin armv7 armv7s armv7k arm64)
 
-  message(STATUS "OSX supported arches: ${DARWIN_osx_ARCHS}")
-  foreach(arch ${DARWIN_osx_ARCHS})
+  message(STATUS "OSX supported arches: ${DARWIN_osx_ARCHS_builtin}")
+  foreach(arch ${DARWIN_osx_ARCHS_builtin})
     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
     set(CAN_TARGET_${arch} 1)
   endforeach()
@@ -108,11 +108,11 @@
   set(DARWIN_10.4_BUILTIN_MIN_VER_FLAG
       -mmacosx-version-min=${DARWIN_10.4_BUILTIN_MIN_VER})
   set(DARWIN_10.4_SKIP_CC_KEXT On)
-  darwin_test_archs(10.4 DARWIN_10.4_ARCHS i386 x86_64)
-  message(STATUS "OSX 10.4 supported builtin arches: ${DARWIN_10.4_ARCHS}")
-  if(DARWIN_10.4_ARCHS)
+  darwin_test_archs(10.4 DARWIN_10.4_ARCHS_builtin i386 x86_64)
+  message(STATUS "OSX 10.4 supported builtin arches: ${DARWIN_10.4_ARCHS_builtin}")
+  if(DARWIN_10.4_ARCHS_builtin)
     # don't include the Haswell slice in the 10.4 compatibility library
-    list(REMOVE_ITEM DARWIN_10.4_ARCHS x86_64h)
+    list(REMOVE_ITEM DARWIN_10.4_ARCHS_builtin x86_64h)
     list(APPEND BUILTIN_SUPPORTED_OS 10.4)
   endif()
 
@@ -125,38 +125,38 @@
 
       set(DARWIN_${platform}sim_SKIP_CC_KEXT On)
 
-      set(test_arches ${DARWIN_sim_ARCHS})
-      if(DARWIN_${platform}sim_ARCHS)
-        set(test_arches DARWIN_${platform}sim_ARCHS)
+      set(test_arches ${DARWIN_sim_ARCHS_builtin})
+      if(DARWIN_${platform}sim_ARCHS_builtin)
+        set(test_arches DARWIN_${platform}sim_ARCHS_builtin)
       endif()
 
       darwin_test_archs(${platform}sim
-        DARWIN_${platform}sim_ARCHS
+        DARWIN_${platform}sim_ARCHS_builtin
         ${test_arches})
-      message(STATUS "${platform} Simulator supported builtin arches: ${DARWIN_${platform}sim_ARCHS}")
-      if(DARWIN_${platform}sim_ARCHS)
+      message(STATUS "${platform} Simulator supported builtin arches: ${DARWIN_${platform}sim_ARCHS_builtin}")
+      if(DARWIN_${platform}sim_ARCHS_builtin)
         list(APPEND BUILTIN_SUPPORTED_OS ${platform}sim)
       endif()
-      foreach(arch ${DARWIN_${platform}sim_ARCHS})
+      foreach(arch ${DARWIN_${platform}sim_ARCHS_builtin})
         list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
         set(CAN_TARGET_${arch} 1)
       endforeach()
     endif()
 
     if(DARWIN_${platform}_SYSROOT)
-      set(test_arches ${DARWIN_device_ARCHS})
-      if(DARWIN_${platform}_ARCHS)
-        set(test_arches DARWIN_${platform}_ARCHS)
+      set(test_arches ${DARWIN_device_ARCHS_builtin})
+      if(DARWIN_${platform}_ARCHS_builtin)
+        set(test_arches DARWIN_${platform}_ARCHS_builtin)
       endif()
 
       darwin_test_archs(${platform}
-        DARWIN_${platform}_ARCHS
+        DARWIN_${platform}_ARCHS_builtin
         ${test_arches})
-      message(STATUS "${platform} supported builtin arches: ${DARWIN_${platform}_ARCHS}")
-      if(DARWIN_${platform}_ARCHS)
+      message(STATUS "${platform} supported builtin arches: ${DARWIN_${platform}_ARCHS_builtin}")
+      if(DARWIN_${platform}_ARCHS_builtin)
         list(APPEND BUILTIN_SUPPORTED_OS ${platform})
       endif()
-      foreach(arch ${DARWIN_${platform}_ARCHS})
+      foreach(arch ${DARWIN_${platform}_ARCHS_builtin})
         list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
         set(CAN_TARGET_${arch} 1)
       endforeach()