Merge pull request #4203 from phausler/build_libdispatch_by_default

build libdispatch by default in both linux build bot configurations

Author: parkera

utils/build-presets.ini

@@ -645,11 +645,13 @@ test
 validation-test
 long-test
 foundation
+libdispatch
 lit-args=-v
 
 dash-dash
 
 install-foundation
+install-libdispatch
 reconfigure
 
 # Ubuntu 16.04 preset for backwards compat and future customizations.
@@ -731,6 +733,7 @@ llbuild
 swiftpm
 xctest
 foundation
+libdispatch
 dash-dash
 
 [preset: buildbot_incremental_linux,long_test]

utils/build-script-impl

@@ -2363,7 +2363,8 @@ for host in "${ALL_HOSTS[@]}"; do
                 SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
                 LLVM_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
 
-                if [[ ! -f "${LIBDISPATCH_BUILD_DIR}"/config.status ]]; then
+                if [[ "${RECONFIGURE}" || ! -f "${LIBDISPATCH_BUILD_DIR}"/config.status ]]; then
+                    echo "Reconfiguring libdispatch"
                     # First time building; need to run autotools and configure
                     if [[ "$LIBDISPATCH_BUILD_TYPE" == "Release" ]] ; then
                         dispatch_build_variant_arg="release"
@@ -2380,7 +2381,8 @@ for host in "${ALL_HOSTS[@]}"; do
                             "${LIBDISPATCH_SOURCE_DIR}"/configure --with-swift-toolchain="${SWIFT_BUILD_PATH}" \
                             --with-build-variant=$dispatch_build_variant_arg \
                             --prefix="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"
-
+                else
+                    echo "Skipping reconfiguration of libdispatch"
                 fi
                 with_pushd "${LIBDISPATCH_BUILD_DIR}" \
                     call make