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

This commit is contained in:
swift-ci
2020-01-31 21:43:05 -08:00

View File

@@ -1416,7 +1416,7 @@ for host in "${ALL_HOSTS[@]}"; do
module_cache="${build_dir}/module-cache" module_cache="${build_dir}/module-cache"
# Add any specific cmake options specified by build-script # Add any specific cmake options specified by build-script
product_cmake_options_name=$(to_varname "${product}")_CMAKE_OPTIONS product_cmake_options_name=$(to_varname "${product/_static}")_CMAKE_OPTIONS
product_cmake_options=(${!product_cmake_options_name}) # convert to array product_cmake_options=(${!product_cmake_options_name}) # convert to array
cmake_options+=("${product_cmake_options[@]}") cmake_options+=("${product_cmake_options[@]}")