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

Merged
merged 1 commit into from
Feb 19, 2020
Merged

[TF] Fix macOS toolchain builds. #29932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2328,10 +2328,11 @@ no-assertions
[preset: mixin_codesigning]
darwin-toolchain-application-cert=lldb_codesign

# Note: tensorflow_osx_base does not mix in "buildbot_osx_package" or
# "mixin_osx_package_base" because they enable ios/tvos/watchos and tests by
# default.
# Instead, options are copied here individually.
# 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.

# options like `skip-ios` to override `ios`.
[preset: tensorflow_osx_base]
mixin-preset=mixin_lightweight_assertions

Expand Down Expand Up @@ -2378,7 +2379,7 @@ test-installable-package
reconfigure

swift-install-components=compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil
install-libcxx

# Path to the .tar.gz package.
Expand Down