averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2019-11-17 01:59:59 -08:00
parent d5ca3542c3 4bf1059f52
commit 2635e11f99
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/build-script-impl
View File

@@ -1614,6 +1614,9 @@ for host in "${ALL_HOSTS[@]}"; do
tmp_product=libdispatch
LIBDISPATCH_STATIC_CMAKE_OPTIONS=${LIBDISPATCH_CMAKE_OPTIONS[@]}
fi
if [[ ${tmp_product} == "foundation_static" ]]; then
tmp_product=foundation
fi
if ! [[ $(should_execute_action "${host}-${tmp_product}-build") ]]; then
continue
fi
@@ -2858,6 +2861,9 @@ for host in "${ALL_HOSTS[@]}"; do
if [[ ${tmp_product} == "libdispatch_static" ]]; then
tmp_product=libdispatch
fi
if [[ ${tmp_product} == "foundation_static" ]]; then
tmp_product=foundation
fi
if ! [[ $(should_execute_action "${host}-${tmp_product}-install") ]]; then
continue
fi