Merge pull request #25085 from spevans/pr_sr_7039

Author: swift-ci

utils/build-script-impl

@@ -2116,7 +2116,11 @@ for host in "${ALL_HOSTS[@]}"; do
 
     for product in "${PRODUCTS[@]}"; do
         # Check if we should perform this action.
-        if ! [[ $(should_execute_action "${host}-${product}-build") ]]; then
+        tmp_product=${product}
+        if [[ ${tmp_product} == "libdispatch_static" ]]; then
+            tmp_product=libdispatch
+        fi
+        if ! [[ $(should_execute_action "${host}-${tmp_product}-build") ]]; then
             continue
         fi
 
@@ -3476,7 +3480,11 @@ for host in "${ALL_HOSTS[@]}"; do
 
     for product in "${PRODUCTS[@]}"; do
         # Check if we should perform this action.
-        if ! [[ $(should_execute_action "${host}-${product}-install") ]]; then
+        tmp_product=${product}
+        if [[ ${tmp_product} == "libdispatch_static" ]]; then
+            tmp_product=libdispatch
+        fi
+        if ! [[ $(should_execute_action "${host}-${tmp_product}-install") ]]; then
             continue
         fi