Skip to content

[TF] Fix macOS toolchain builds. #29932

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

Jump to bottom
Merged
merged 1 commit into from
Feb 19, 2020
Merged

[TF] Fix macOS toolchain builds. #29932

merged 1 commit into from
Feb 19, 2020

Conversation

dan-zheng
Copy link
Contributor

Fix tensorflow_osx_base preset: add dsymutil to llvm-install-components.

After the recent master -> tensorflow merge (#29768), SwiftPM fails with an error regarding dsymutil.

--- bootstrap: note: Building SwiftPM (with swift-build)
...
[101/108] Compiling Xcodeproj PropertyList.swift
[102/108] Compiling XCBuildSupport PIF.swift
[103/108] Compiling Build BuildDelegate.swift
[104/109] Compiling Workspace Destination.swift
warning: base type ref doesn't point to DW_TAG_base_type.
note: while processing /Users/swiftninjas/s4tf/build/buildbot_osx/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/Build.build/BuildDelegate.swift.o
<unknown>:0: error: unable to execute command: Segmentation fault: 11
<unknown>:0: error: generate-dSYM command failed due to signal 11 (use -v to see invocation)
[104/110] Linking libSwiftPM.dylib

Verified that the fix works: tensorflow/swift#390

This issue surfaced because the tensorflow_osx_base preset does not mixin buildbot_osx_package directly. There may exist a more robust long-term solution involving LLVM_DISTRIBUTION_COMPONENTS.

@dan-zheng
[TF] Fix macOS toolchain builds.
a89b1cb 
Fix `tensorflow_osx_base` preset: add `dsymutil` to `llvm-install-components`.
@dan-zheng dan-zheng added the tensorflow This is for "tensorflow" branch PRs. label Feb 19, 2020
dan-zheng
dan-zheng commented Feb 19, 2020
View reviewed changes
utils/build-presets.ini
# Note: `tensorflow_osx_base` does not mix in `buildbot_osx_package` because
# they enable ios/tvos/watchos by default. Instead, options are copied here
# individually.
# TODO(TF-941): Try to mixin `buildbot_osx_package` directly. This requires
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: I'm looking into TF-941 now. If tensorflow_osx_base can mixin buildbot_osx_package directly, we won't encounter this kind of error in the future.

@dan-zheng dan-zheng requested a review from compnerd February 19, 2020 21:05
compnerd
compnerd approved these changes Feb 19, 2020
View reviewed changes
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Note that this wont get pulled into the current tensorflow-merge branch cleanly. You want to merge this into that branch as well?

@dan-zheng dan-zheng merged commit 9ee45c4 into swiftlang:tensorflow Feb 19, 2020
@dan-zheng dan-zheng deleted the macosx-toolchain-fix branch February 19, 2020 21:28
@dan-zheng dan-zheng mentioned this pull request Feb 19, 2020
Closed
@dan-zheng
Copy link
Contributor Author

Note that this wont get pulled into the current tensorflow-merge branch cleanly. You want to merge this into that branch as well?

Sure thing: #29933.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

Assignees
No one assigned
Labels
tensorflow This is for "tensorflow" branch PRs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dan-zheng @compnerd