libswift: fix dependencies in the bootstrapping build mode

swiftDarwin and swiftOnoneSupport  didn't depend on building the Swift core library.
This was a subtle bug, because the compiler just picked up the module from the SDK instead of the (still building) Swift module.
It only resulted in compiler errors if the SDK swiftinterface was too new to be parsable by the compiler.

Author: eeckstein

cmake/modules/SwiftUtils.cmake

@@ -117,6 +117,12 @@ function(add_bootstrapping_target bootstrapping)
     set(target "bootstrapping${bootstrapping}-all")
     add_custom_target(${target})
 
+    if(${LIBSWIFT_BUILD_MODE} STREQUAL "BOOTSTRAPPING")
+      set(lib_target "bootstrapping${bootstrapping}-corelib")
+      add_custom_target(${lib_target})
+      add_dependencies(${target} ${lib_target})
+    endif()
+
     if(SWIFT_PATH_TO_LIBICU_BUILD)
       # Need to symlink the libicu libraries to be able to run
       # the bootstrapping compiler with a custom library path.

stdlib/public/Platform/CMakeLists.txt

@@ -55,10 +55,12 @@ if(${LIBSWIFT_BUILD_MODE} STREQUAL "BOOTSTRAPPING" AND
 
   add_swift_target_library_single(swiftDarwin-bootstrapping0 swiftDarwin
       ${swiftDarwin_common_bootstrapping_options}
+      FILE_DEPENDS bootstrapping0-corelib
       BOOTSTRAPPING 0)
 
   add_swift_target_library_single(swiftDarwin-bootstrapping1 swiftDarwin
       ${swiftDarwin_common_bootstrapping_options}
+      FILE_DEPENDS bootstrapping1-corelib
       BOOTSTRAPPING 1)
 
   add_dependencies(bootstrapping1-all swiftDarwin-bootstrapping1)

stdlib/public/SwiftOnoneSupport/CMakeLists.txt

@@ -24,17 +24,19 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${LIBSWIFT_BUILD_MODE} STREQUAL "BOOTST
 
   add_swift_target_library_single(swiftSwiftOnoneSupport-bootstrapping0 swiftSwiftOnoneSupport
     ${swiftOnoneSupport_common_bootstrapping_options}
+    FILE_DEPENDS swiftCore-bootstrapping0
     BOOTSTRAPPING 0)
 
-  add_dependencies(bootstrapping0-all swiftSwiftOnoneSupport-bootstrapping0)
+  add_dependencies(bootstrapping0-corelib swiftSwiftOnoneSupport-bootstrapping0)
 
   # Bootstrapping - stage 1
 
   add_swift_target_library_single(swiftSwiftOnoneSupport-bootstrapping1 swiftSwiftOnoneSupport
     ${swiftOnoneSupport_common_bootstrapping_options}
+    FILE_DEPENDS swiftCore-bootstrapping1
     BOOTSTRAPPING 1)
 
-  add_dependencies(bootstrapping1-all swiftSwiftOnoneSupport-bootstrapping1)
+  add_dependencies(bootstrapping1-corelib swiftSwiftOnoneSupport-bootstrapping1)
 
 endif()
 

stdlib/public/core/CMakeLists.txt

@@ -368,8 +368,8 @@ if(${LIBSWIFT_BUILD_MODE} STREQUAL "BOOTSTRAPPING")
                       symlink-headers-bootstrapping1 ${swiftCore_common_dependencies}
                     BOOTSTRAPPING 1)
 
-  add_dependencies(bootstrapping1-all swiftCore-bootstrapping1)
-  add_dependencies(bootstrapping0-all swiftCore-bootstrapping0)
+  add_dependencies(bootstrapping1-corelib swiftCore-bootstrapping1)
+  add_dependencies(bootstrapping0-corelib swiftCore-bootstrapping0)
 endif()
 
 add_swift_target_library(swiftCore