build: temporary staging changes for integration changes

This set of change is less than ideal.  However, this is the last piece to make
the generated toolchain image currently the same with the old build system.
With this in plae, we can finally switch over to CMake.

Author: compnerd

CMakeLists.txt

@@ -432,22 +432,34 @@ if(ENABLE_TESTING)
                            ${CMAKE_CURRENT_BINARY_DIR}/TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX})
 endif()
 
-get_swift_host_arch(SWIFT_HOST_ARCH)
+string(TOLOWER ${CMAKE_SYSTEM_NAME} swift_os)
+get_swift_host_arch(swift_arch)
 
+# TODO(compnerd) honour lib vs lib64
 install(FILES
           ${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftdoc
           ${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftmodule
         DESTINATION
-          ${CMAKE_INSTALL_FULL_LIBDIR}/swift/${CMAKE_SYSTEM_NAME}/${SWIFT_HOST_ARCH})
+          lib/swift/${swift_os}/${swift_arch})
 install(FILES
           ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Foundation${CMAKE_SHARED_LIBRARY_SUFFIX}
         DESTINATION
-          ${CMAKE_INSTALL_FULL_LIBDIR})
+          lib/swift/${swift_os})
+# TODO(compnerd) install as a Framework as that is how swift actually is built
+install(DIRECTORY
+          ${install_dir}/System/Library/Frameworks/CoreFoundation.framework/Headers/
+        DESTINATION
+          lib/swift/CoreFoundation
+        FILES_MATCHING PATTERN "*.h")
+install(FILES
+          CoreFoundation/Base.subproj/module.map
+        DESTINATION
+          lib/swift/CoreFoundation)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   install(FILES
             ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Foundation${CMAKE_SHARED_LIBRARY_SUFFIX}
           DESTINATION
-            ${CMAKE_INSTALL_FULL_LIBDIR}/swift/${CMAKE_SYSTEM_NAME}/${SWIFT_HOST_ARCH})
+            lib/swift/${swift_os}/${swift_arch})
 endif()
 install(FILES
           ${CMAKE_CURRENT_BINARY_DIR}/plutil

CoreFoundation/Base.subproj/module.map

@@ -0,0 +1,4 @@
+module CoreFoundation [extern_c] [system] {
+    umbrella header "CoreFoundation.h"
+    explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
+}