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 pkg-build-from-tc-combined

Browse Source
This commit is contained in:
Mishal Shah
2019-02-05 22:15:03 -08:00
committed by GitHub
parent 953cb4cb05 5116244318
commit 2f7e367ed0
94 changed files with 1363 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/build-script
View File

@@ -617,6 +617,8 @@ class BuildScriptInvocation(object):
impl_args += ["--skip-build-lldb"]
if not args.build_llbuild:
impl_args += ["--skip-build-llbuild"]
if not args.build_libcxx:
impl_args += ["--skip-build-libcxx"]
if not args.build_libdispatch:
impl_args += ["--skip-build-libdispatch"]
if not args.build_libicu:
@@ -859,7 +861,8 @@ class BuildScriptInvocation(object):
product_classes = []
product_classes.append(products.CMark)
product_classes.append(products.LLVM)
product_classes.append(products.LibCXX)
if self.args.build_libcxx:
product_classes.append(products.LibCXX)
if self.args.build_libicu:
product_classes.append(products.LibICU)
product_classes.append(products.Swift)