Skip to content

Commit c0d5284

Browse files
committed
[build-script-impl] Move a skip install check earlier so it affects the merge-lipo action.
This allows `SKIP_LOCAL_HOST_INSTALL` to actually affect the merge-lipo action. This in turn permits cross-compilation which doesn't want the local host's tools installed to generate a DSTROOT without a `merged-hosts` directory reliably. This addresses <rdar://problem/85511320>.
1 parent 63f355f commit c0d5284

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
@@ -3064,6 +3064,11 @@ for host in "${ALL_HOSTS[@]}"; do
30643064
host_install_destdir=$(get_host_install_destdir ${host})
30653065
host_install_prefix=$(get_host_install_prefix ${host})
30663066

3067+
# Skip this pass if flag is set and we are cross compiling and it's the local host.
3068+
if [[ "${SKIP_LOCAL_HOST_INSTALL}" ]] && [[ $(has_cross_compile_hosts) ]] && [[ ${host} == ${LOCAL_HOST} ]]; then
3069+
continue
3070+
fi
3071+
30673072
# Identify the destdirs to pass to lipo. Must happen even if the install action
30683073
# is to be skipped.
30693074
if [[ $(should_include_host_in_lipo ${host}) ]]; then
@@ -3075,11 +3080,6 @@ for host in "${ALL_HOSTS[@]}"; do
30753080
continue
30763081
fi
30773082

3078-
# Skip this pass if flag is set and we are cross compiling and it's the local host.
3079-
if [[ "${SKIP_LOCAL_HOST_INSTALL}" ]] && [[ $(has_cross_compile_hosts) ]] && [[ ${host} == ${LOCAL_HOST} ]]; then
3080-
continue
3081-
fi
3082-
30833083
# Set the build options for this host
30843084
set_build_options_for_host $host
30853085

0 commit comments

Comments
 (0)