Merge pull request #1697 from openshift-cherrypick-robot/cherry-pick-…

…1694-to-release-4.11 [release-4.11] OCPBUGS-18843: UPSTREAM: <carry>: Force using host go always and use host libriaries
openshift · Sep 12, 2023 · 6981c04 · 6981c04
2 parents 7aa7ea9 + 1c28fdd
commit 6981c04
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -356,7 +356,9 @@ kube::golang::is_statically_linked_library() {
   if [[ -n "${KUBE_CGO_OVERRIDES_LIST:+x}" ]]; then
     for e in "${KUBE_CGO_OVERRIDES_LIST[@]}"; do [[ "${1}" == *"/${e}" ]] && return 1; done;
   fi
-  for e in "${KUBE_STATIC_LIBRARIES[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
+  if [[ -n "${KUBE_STATIC_LIBRARIES:+x}" ]]; then
+    for e in "${KUBE_STATIC_LIBRARIES[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
+  fi
   if [[ -n "${KUBE_STATIC_OVERRIDES_LIST:+x}" ]]; then
     for e in "${KUBE_STATIC_OVERRIDES_LIST[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
   fi