Revert "Force enabling SwiftCompilerSources in the build"

This reverts commit 410b81b.

Author: DougGregor

CMakeLists.txt

@@ -946,10 +946,6 @@ set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include")
 set(SWIFT_SHIMS_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/stdlib/public/SwiftShims")
 set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 
-if (NOT BOOTSTRAPPING_MODE)
-  message(FATAL_ERROR "turning off bootstrapping is not supported anymore")
-endif()
-
 # As a temporary workaround, disable SwiftCompilerSources on
 # Windows/ARM64 because the compiler segfaults
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")

utils/build-presets.ini

@@ -969,6 +969,15 @@ mixin-preset=
     buildbot_linux
     mixin_buildbot_linux,no_test
 
+[preset: buildbot_linux,no_test,bootstrapping_off]
+mixin-preset=
+    buildbot_linux,no_test
+
+skip-early-swift-driver
+skip-early-swiftsyntax
+
+bootstrapping=off
+
 [preset: buildbot_linux,no_assertions,no_test]
 mixin-preset=
     buildbot_linux,no_assertions

utils/build-script-impl

@@ -385,6 +385,24 @@ function true_false() {
     esac
 }
 
+function to_bootstrapping_mode() {
+    case "$1" in
+        false | FALSE | 0)
+            echo "OFF"
+            ;;
+        true | TRUE | 1 | "")
+            if [[ "$(uname -s)" == "Darwin" ]] ; then
+              echo "BOOTSTRAPPING-WITH-HOSTLIBS"
+            else
+              echo "BOOTSTRAPPING"
+            fi
+            ;;
+        *)
+            echo `toupper $1`
+            ;;
+    esac
+}
+
 function to_varname() {
     # Uses `tr` because it is orders of magnitude faster than ${1//-/_} on long
     # strings, which happens when translating KNOWN_SETTINGS.
@@ -1634,13 +1652,6 @@ for host in "${ALL_HOSTS[@]}"; do
         )
     fi
 
-    if [[ "${BOOTSTRAPPING}" ]] ; then
-        swift_cmake_options=(
-            "${swift_cmake_options[@]}"
-            -DBOOTSTRAPPING_MODE:STRING=`toupper ${BOOTSTRAPPING}`
-        )
-    fi
-
     if [[ "${NATIVE_CLANG_TOOLS_PATH}" ]] ; then
         CLANG_BIN="${NATIVE_CLANG_TOOLS_PATH}"
         if [[ ! -f "${CLANG_BIN}/clang" ]] ; then
@@ -1818,6 +1829,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
                     -DCMAKE_BUILD_TYPE:STRING="${SWIFT_BUILD_TYPE}"
                     -DLLVM_ENABLE_ASSERTIONS:BOOL=$(true_false "${SWIFT_ENABLE_ASSERTIONS}")
+                    -DBOOTSTRAPPING_MODE:STRING=$(to_bootstrapping_mode "${BOOTSTRAPPING}")
                     -DSWIFT_ANALYZE_CODE_COVERAGE:STRING=$(toupper "${SWIFT_ANALYZE_CODE_COVERAGE}")
                     -DSWIFT_STDLIB_BUILD_TYPE:STRING="${SWIFT_STDLIB_BUILD_TYPE}"
                     -DSWIFT_STDLIB_ASSERTIONS:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_ASSERTIONS}")

utils/build_swift/build_swift/driver_arguments.py

@@ -638,9 +638,9 @@ def create_argument_parser():
            help='A semi-colon split list of llvm components to install')
 
     option('--bootstrapping', store('bootstrapping_mode'),
-           choices=['hosttools', 'bootstrapping', 'bootstrapping-with-hostlibs'],
+           choices=['off', 'hosttools', 'bootstrapping', 'bootstrapping-with-hostlibs'],
            help='The bootstrapping build mode for swift compiler modules. '
-                'Available modes: `hosttools`, `bootstrapping`, '
+                'Available modes: `off`, `hosttools`, `bootstrapping`, '
                 '`bootstrapping-with-hostlibs`, `crosscompile`, and '
                 '`crosscompile-with-hostlibs`')
 

utils/build_swift/tests/expected_options.py

@@ -870,7 +870,7 @@ class BuildScriptImplOption(_BaseOption):
 
     SetOption('--bootstrapping', dest='bootstrapping_mode'),
     ChoicesOption('--bootstrapping', dest='bootstrapping_mode',
-                  choices=['hosttools', 'bootstrapping',
+                  choices=['off', 'hosttools', 'bootstrapping',
                            'bootstrapping-with-hostlibs']),
 
     # NOTE: We'll need to manually test the behavior of these since they