Skip to content

Commit 76d4c1f

Browse files
authored
Merge pull request swiftlang#29211 from xiaobai/no-more-containers
[build] Remove function contains_product from build-script-impl
2 parents fe9a4db + 6ff8722 commit 76d4c1f

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

utils/build-script-impl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,18 +1066,6 @@ if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
10661066
PRODUCTS=("${PRODUCTS[@]}" xctest)
10671067
fi
10681068

1069-
# Checks if a given product is enabled (i.e. part of $PRODUCTS array)
1070-
function contains_product() {
1071-
local current_product
1072-
for current_product in "${PRODUCTS[@]}"; do
1073-
if [[ "$current_product" == "$1" ]]; then
1074-
return 0
1075-
fi
1076-
done
1077-
return 1
1078-
}
1079-
1080-
10811069
# get_host_specific_variable(host, name)
10821070
#
10831071
# Get the value of a host-specific variable expected to have been passed by the
@@ -1797,7 +1785,7 @@ for host in "${ALL_HOSTS[@]}"; do
17971785
)
17981786
fi
17991787

1800-
if contains_product "lldb" ; then
1788+
if [[ ! "${SKIP_BUILD_LLDB}" ]] ; then
18011789
lldb_build_dir=$(build_directory ${host} lldb)
18021790
cmake_options=(
18031791
"${cmake_options[@]}"

0 commit comments

Comments
 (0)