Skip to content

[build-script] Pass llbuild build type arg to build-script-impl #14914

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.

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 1 commit into from
Mar 5, 2018

Conversation

aciidgh
Copy link
Contributor

@aciidgh aciidgh commented Mar 1, 2018

No description provided.

rdar://38034197 (llbuild may not be building in release mode in the Swift toolchain)
@aciidgh aciidgh requested review from graydon and ddunbar March 1, 2018 20:48
@aciidgh
Copy link
Contributor Author

aciidgh commented Mar 1, 2018

@swift-ci please smoke test

Copy link
Contributor

@graydon graydon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you'll might also want to do something about setting --llbuild-enable-assertions. Not sure which flag to derive it from, but maybe there's at least one not-explicitly-specified config where the right inferred setting is 0?

@ddunbar
Copy link
Contributor

ddunbar commented Mar 2, 2018

Can we piggy back on whatever swiftc itself uses to determine if assertions are enabled?

@graydon
Copy link
Contributor

graydon commented Mar 2, 2018

Yeah, I believe utils/build_swift/driver_arguments.py has a set of options for sub-project specific assertions, which you'll need to add a --llbuild-assertions entry for, and then a function _apply_default_arguments that propagates the umbrella build-script command-line argument --assertions and --no-assertions to the sub-arguments like --swift-assertions, --llvm-assertions, --cmark-assertions and so forth (and which get passed along to build-script-impl in ways I think are determined by convert_to_impl_arguments in build-script) . I'd suggest wiring those 3 places up to pass along --llbuild-assertions the same way.

@aciidgh
Copy link
Contributor Author

aciidgh commented Mar 2, 2018

I don't see an option to control assertions in llbuild's cmake configuration. I think we can file a separate bug for tracking that.

@aciidgh
Copy link
Contributor Author

aciidgh commented Mar 5, 2018

@graydon @ddunbar nag

@graydon
Copy link
Contributor

graydon commented Mar 5, 2018

(LGTM!)

Copy link
Contributor

@ddunbar ddunbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but lets also try and get the asserts part sooner rather than later. If you don't feel like tackling it, hand me a bug for it.

@aciidgh aciidgh merged commit a9cc598 into swiftlang:master Mar 5, 2018
@aciidgh aciidgh deleted the fix-llbuild branch March 5, 2018 18:42
@aciidgh
Copy link
Contributor Author

aciidgh commented Mar 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants