Skip to content

Commit 190f69a

Browse files
authored
Merge pull request swiftlang#40229 from cwakamo/eng/PR-85511320-skip-install-merge-lipo-fix
[build-script-impl] Move a skip install check earlier so it affects the merge-lipo action. This addresses <rdar://problem/85511320>.
2 parents 1739c23 + c0d5284 commit 190f69a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

utils/build-script-impl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3082,6 +3082,11 @@ for host in "${ALL_HOSTS[@]}"; do
30823082
host_install_destdir=$(get_host_install_destdir ${host})
30833083
host_install_prefix=$(get_host_install_prefix ${host})
30843084

3085+
# Skip this pass if flag is set and we are cross compiling and it's the local host.
3086+
if [[ "${SKIP_LOCAL_HOST_INSTALL}" ]] && [[ $(has_cross_compile_hosts) ]] && [[ ${host} == ${LOCAL_HOST} ]]; then
3087+
continue
3088+
fi
3089+
30853090
# Identify the destdirs to pass to lipo. Must happen even if the install action
30863091
# is to be skipped.
30873092
if [[ $(should_include_host_in_lipo ${host}) ]]; then
@@ -3093,11 +3098,6 @@ for host in "${ALL_HOSTS[@]}"; do
30933098
continue
30943099
fi
30953100

3096-
# Skip this pass if flag is set and we are cross compiling and it's the local host.
3097-
if [[ "${SKIP_LOCAL_HOST_INSTALL}" ]] && [[ $(has_cross_compile_hosts) ]] && [[ ${host} == ${LOCAL_HOST} ]]; then
3098-
continue
3099-
fi
3100-
31013101
# Set the build options for this host
31023102
set_build_options_for_host $host
31033103

0 commit comments

Comments
 (0)