build-script-impl: Remove libxml2, zlib, and curl from the list of components

Author: AnthonyLatsis

utils/build-script-impl

@@ -272,9 +272,6 @@ components=(
   libcxx
   libdispatch
   libicu
-  libxml2
-  zlib
-  curl
   llbuild
   lldb
   static-foundation
@@ -2375,61 +2372,53 @@ for host in "${ALL_HOSTS[@]}"; do
                     LIBICU_BUILD_ARGS=()
                 fi
 
-                if [[ ! "${SKIP_BUILD_LIBXML2}" ]]; then
-                    BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
-                    LIBXML2_HEADERS="${BASE_INSTALL_DIR}/usr/include/libxml2"
-                    LIBXML2_LIBRARY="${BASE_INSTALL_DIR}/usr/lib/libxml2.a"
+                BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
+                LIBXML2_HEADERS="${BASE_INSTALL_DIR}/usr/include/libxml2"
+                LIBXML2_LIBRARY="${BASE_INSTALL_DIR}/usr/lib/libxml2.a"
 
-                    if [[ -z "${DRY_RUN}" && ! -d "${LIBXML2_HEADERS}" ]]; then
-                        echo "Error: '${LIBXML2_HEADERS}' does not exist" 1>&2
-                        exit 1
-                    fi
-
-                    if [[ -z "${DRY_RUN}" && ! -e "${LIBXML2_LIBRARY}" ]]; then
-                        echo "Error: '${LIBXML2_LIBRARY}' does not exist" 1>&2
-                        exit 1
-                    fi
-
-                    LIBXML2_BUILD_ARGS=(
-                        -DLIBXML2_INCLUDE_DIR:PATH="${LIBXML2_HEADERS}"
-                        -DLIBXML2_LIBRARY:PATH="${LIBXML2_LIBRARY}"
-                        -DLIBXML2_DEFINITIONS="-DLIBXML_STATIC"
-                    )
-                else
-                    LIBXML2_BUILD_ARGS=()
+                if [[ -z "${DRY_RUN}" && ! -d "${LIBXML2_HEADERS}" ]]; then
+                    echo "Error: '${LIBXML2_HEADERS}' does not exist" 1>&2
+                    exit 1
                 fi
 
-                if [[ ! "${SKIP_BUILD_ZLIB}" ]]; then
-                    BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
-                    ZLIB_HEADERS="${BASE_INSTALL_DIR}/usr/include"
-                    # Note: On Windows, the spelling is 'zlibstatic.lib',
-                    #       so if this is ported to python, that case will need
-                    #       to be handled.
-                    ZLIB_LIBRARY="${BASE_INSTALL_DIR}/usr/lib/libz.a"
+                if [[ -z "${DRY_RUN}" && ! -e "${LIBXML2_LIBRARY}" ]]; then
+                    echo "Error: '${LIBXML2_LIBRARY}' does not exist" 1>&2
+                    exit 1
+                fi
 
-                    if [[ -z "${DRY_RUN}" && ! -d "${ZLIB_HEADERS}" ]]; then
-                        echo "Error: '${ZLIB_HEADERS}' does not exist" 1>&2
-                        exit 1
-                    fi
+                LIBXML2_BUILD_ARGS=(
+                    -DLIBXML2_INCLUDE_DIR:PATH="${LIBXML2_HEADERS}"
+                    -DLIBXML2_LIBRARY:PATH="${LIBXML2_LIBRARY}"
+                    -DLIBXML2_DEFINITIONS="-DLIBXML_STATIC"
+                )
 
-                    if [[ -z "${DRY_RUN}" && ! -e "${ZLIB_LIBRARY}" ]]; then
-                        echo "Error: '${ZLIB_LIBRARY}' does not exist" 1>&2
-                        exit 1
-                    fi
+                BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
+                ZLIB_HEADERS="${BASE_INSTALL_DIR}/usr/include"
+                # Note: On Windows, the spelling is 'zlibstatic.lib',
+                #       so if this is ported to python, that case will need
+                #       to be handled.
+                ZLIB_LIBRARY="${BASE_INSTALL_DIR}/usr/lib/libz.a"
 
-                    ZLIB_BUILD_ARGS=(
-                        -DZLIB_INCLUDE_DIR:PATH="${ZLIB_HEADERS}"
-                        -DZLIB_LIBRARY:PATH="${ZLIB_LIBRARY}"
-                    )
+                if [[ -z "${DRY_RUN}" && ! -d "${ZLIB_HEADERS}" ]]; then
+                    echo "Error: '${ZLIB_HEADERS}' does not exist" 1>&2
+                    exit 1
                 fi
 
-                if [[ ! "${SKIP_BUILD_CURL}" ]]; then
-                    BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
-                    CURL_BUILD_ARGS=(
-                        -DCURL_DIR="${BASE_INSTALL_DIR}/usr/lib/cmake/CURL"
-                    )
+                if [[ -z "${DRY_RUN}" && ! -e "${ZLIB_LIBRARY}" ]]; then
+                    echo "Error: '${ZLIB_LIBRARY}' does not exist" 1>&2
+                    exit 1
                 fi
 
+                ZLIB_BUILD_ARGS=(
+                    -DZLIB_INCLUDE_DIR:PATH="${ZLIB_HEADERS}"
+                    -DZLIB_LIBRARY:PATH="${ZLIB_LIBRARY}"
+                )
+
+                BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
+                CURL_BUILD_ARGS=(
+                    -DCURL_DIR="${BASE_INSTALL_DIR}/usr/lib/cmake/CURL"
+                )
+
                 if [[ "${SKIP_CLEAN_FOUNDATION}" == "0" ]]
                 then
                   # The Swift project might have been changed, but CMake might