Merge pull request #40106 from eeckstein/fix-bootstrapping-build

cmake: fix some problems related to bootstrapping

Author: eeckstein

libswift/CMakeLists.txt

@@ -45,10 +45,11 @@ else()
         DEPENDS "bootstrapping1-all")
 
     if(LIBSWIFT_BUILD_MODE STREQUAL "BOOTSTRAPPING-WITH-HOSTLIBS")
-      if(EXISTS "${CMAKE_BINARY_DIR}/bootstrapping0/lib/swift/macos/Swift.swiftmodule" OR
-         EXISTS "${CMAKE_BINARY_DIR}/bootstrapping1/lib/swift/macos/Swift.swiftmodule")
-        messsage(FATAL_ERROR "Please clean the ${CMAKE_BINARY_DIR}/bootstrapping[01] directories")
-      endif()
+      file(GLOB module_dirs "${CMAKE_BINARY_DIR}/bootstrapping*/lib/swift/macosx/*.swiftmodule")
+      foreach(module_dir ${module_dirs})
+        message(WARNING "${module_dir} found from a previous 'bootstrapping' build: removing")
+        file(REMOVE_RECURSE "${module_dir}")
+      endforeach()
     endif()
   else()
     message(FATAL_ERROR "Unknown LIBSWIFT_BUILD_MODE '${LIBSWIFT_BUILD_MODE}'")

stdlib/public/core/CMakeLists.txt

@@ -288,8 +288,9 @@ endif()
 if(SWIFT_STDLIB_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING)
   list(APPEND swift_stdlib_compile_flags "-enforce-exclusivity=checked")
 endif()
+set(compile_flags_for_final_build)
 if(SWIFT_ENABLE_ARRAY_COW_CHECKS)
-  list(APPEND swift_stdlib_compile_flags "-DCOW_CHECKS_ENABLED")
+  list(APPEND compile_flags_for_final_build "-DCOW_CHECKS_ENABLED")
 endif()
 
 # STAGING: Temporarily avoids having to write #fileID in Swift.swiftinterface.
@@ -318,16 +319,16 @@ set(swiftCore_common_options
                     ${SWIFTLIB_SOURCES}
                   GYB_SOURCES
                     ${SWIFTLIB_GYB_SOURCES}
-                  SWIFT_COMPILE_FLAGS
-                    ${swift_stdlib_compile_flags} -Xcc -DswiftCore_EXPORTS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
                   LINK_FLAGS
                     ${swift_core_link_flags}
                   PRIVATE_LINK_LIBRARIES
                     ${swift_core_private_link_libraries}
                   INCORPORATE_OBJECT_LIBRARIES
                     ${swift_core_incorporate_object_libraries}
                   FRAMEWORK_DEPENDS
-                    ${swift_core_framework_depends})
+                    ${swift_core_framework_depends}
+                  SWIFT_COMPILE_FLAGS
+                    ${swift_stdlib_compile_flags} -Xcc -DswiftCore_EXPORTS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS})
 
 # The copy_shim_headers target dependency is required to let the
 # build system know that there's a rule to produce the shims
@@ -375,6 +376,7 @@ endif()
 add_swift_target_library(swiftCore
                   ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
                   ${swiftCore_common_options}
+                  ${compile_flags_for_final_build}
                   FILE_DEPENDS
                     ${swiftCore_common_dependencies}
                   INSTALL_IN_COMPONENT

utils/build-presets.ini

@@ -216,6 +216,8 @@ skip-test-tvos-host
 skip-test-watchos-host
 check-incremental-compilation
 
+libswift=bootstrapping-with-hostlibs
+
 [preset: buildbot,tools=R,stdlib=RD,test=non_executable]
 mixin-preset=
      mixin_buildbot_tools_R_stdlib_RD
@@ -335,6 +337,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+enable-array-cow-checks
+
 build-swift-stdlib-unittest-extra
 
 libcxx