Force enabling SwiftCompilerSources in the build

This means that `bootstrapping=off` cannot be used anymore.

Author: eeckstein

CMakeLists.txt

@@ -897,6 +897,10 @@ 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()
+
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
 if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")

utils/build-presets.ini

@@ -952,15 +952,6 @@ 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

@@ -379,24 +379,6 @@ 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.
@@ -1628,6 +1610,13 @@ 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
@@ -1785,7 +1774,6 @@ 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

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

utils/build_swift/tests/expected_options.py

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