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 branch 'master' into master-next

Browse Source 
# Conflicts:
#	utils/build-script-impl
This commit is contained in:
Karoy Lorentey
2019-05-29 16:29:40 -07:00
parent 2900a59df7 9821d46200
commit 63cb81d7a3
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/build-script-impl
View File

@@ -2153,8 +2153,18 @@ for host in "${ALL_HOSTS[@]}"; do
fi
if [ "${SKIP_BUILD_LLVM}" ] ; then
# We can't skip the build completely because the standalone
# build of Swift depend on these for testing etc.
build_targets=(llvm-tblgen clang-resource-headers intrinsics_gen clang-tablegen-targets FileCheck not)
# build of Swift depend on these for building and testing.
build_targets=(llvm-tblgen clang-resource-headers intrinsics_gen clang-tablegen-targets)
# If we are not performing a toolchain only build, then we
# also want to include FileCheck and not for testing
# purposes.
if [[ ! "${BUILD_TOOLCHAIN_ONLY}" ]] ; then
build_targets=(
"${build_targets[@]}"
FileCheck
not
)
fi
fi
if [ "${HOST_LIBTOOL}" ] ; then