Update for feedback

Author: benlangmuir

utils/build-script

@@ -531,7 +531,7 @@ class BuildScriptInvocation(object):
             # just invoke cmake from build-script directly rather than futzing
             # with build-script-impl. This makes even more sense since there
             # really isn't a security issue here.
-            if len(cmake_opts) > 0:
+            if cmake_opts:
                 impl_args += [
                     "--%s-cmake-options=%s" %
                     (product_name, ' '.join(cmake_opts))

utils/build-script-impl

@@ -2352,8 +2352,6 @@ for host in "${ALL_HOSTS[@]}"; do
                         -DSWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_UC_INCLUDE:STRING="${ICU_TMPINSTALL}/include"
                         -DSWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_I18N_INCLUDE:STRING="${ICU_TMPINSTALL}/include"
                         -DSWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_STATICLIB:BOOL=TRUE
-                        -DICU_UC_LIBDIR:PATH="${LIBICU_BUILD_DIR}/lib"
-                        -DICU_I18N_LIBDIR:PATH="${LIBICU_BUILD_DIR}/lib"
                     )
                 fi