Skip to content

[build-script] Turn on --no-legacy-impl by default #21772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 24, 2019
Merged

[build-script] Turn on --no-legacy-impl by default #21772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5619138
[build-script] Turn on --no-legacy-impl by default
benlangmuir Dec 4, 2018
5dbe28b
Update for feedback
benlangmuir Jan 11, 2019
08eabb4
Update --*-cmake-options to use format()
benlangmuir Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,11 @@ class BuildScriptInvocation(object):
# just invoke cmake from build-script directly rather than futzing
# with build-script-impl. This makes even more sense since there
# really isn't a security issue here.
impl_args += [
"--%s-cmake-options=%s" % (product_name, ' '.join(cmake_opts))
]
if cmake_opts:
impl_args += [
"--{}-cmake-options={}".format(
product_name, ' '.join(cmake_opts))
]

if args.build_stdlib_deployment_targets:
impl_args += [
Expand Down Expand Up @@ -844,16 +846,20 @@ class BuildScriptInvocation(object):
product_classes.append(products.Swift)
if self.args.build_lldb:
product_classes.append(products.LLDB)
if self.args.build_llbuild:
product_classes.append(products.LLBuild)
if self.args.build_libdispatch:
product_classes.append(products.LibDispatch)
if self.args.build_foundation:
product_classes.append(products.Foundation)
if self.args.build_xctest:
product_classes.append(products.XCTest)
if self.args.build_llbuild:
product_classes.append(products.LLBuild)
if self.args.build_swiftpm:
product_classes.append(products.SwiftPM)
if self.args.build_swiftsyntax:
product_classes.append(products.SwiftSyntax)
if self.args.build_skstresstester:
product_classes.append(products.SKStressTester)
return product_classes

def execute(self):
Expand All @@ -878,7 +884,7 @@ class BuildScriptInvocation(object):
name == "merged-hosts-lipo"), "invalid action"
action_name = name
elif product_class is None:
assert name == "package", "invalid action"
assert name in ("package", "extractsymbols"), "invalid action"
action_name = "{}-{}".format(host.name, name)
else:
assert name is not None, "invalid action"
Expand Down Expand Up @@ -930,6 +936,10 @@ class BuildScriptInvocation(object):
for product_class in product_classes:
execute_one_impl_action(host_target, product_class, "install")

# Extract symbols...
for host_target in all_hosts:
execute_one_impl_action(host_target, name="extractsymbols")

# Package...
for host_target in all_hosts:
execute_one_impl_action(host_target, name="package")
Expand Down
Loading