Fix tensorflow_osx_base build preset. #28018
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rename `clang-headers` to `clang-resources-headers`. Upstream patch: swiftlang#27161 This fixes macOS toolchain builds via `build-toolchain-tensorflow`.
dan-zheng
commented
Nov 1, 2019
| @@ -2152,7 +2152,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-headers;compiler-rt;clangd | |||
| llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd | |||
There was a problem hiding this comment.
Note: it would be much nicer to avoid these issues by reusing the mixin_osx_package_base preset for tensorflow_osx_base instead of duplicating it.
Here's a historical note for the tensorflow_osx_base preset:
# 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.
[preset: tensorflow_osx_base]
mixin-preset=mixin_lightweight_assertions
We could try mixing in mixin_osx_package_base for tensorflow_osx_base and overriding ios/tvos/watchos with skip-ios/skip-tvos/skip-watchos.
There was a problem hiding this comment.
Filed TF-941 to track this issue.
marcrasi
approved these changes
Nov 1, 2019
|
@swift-ci Please test tensorflow |
|
@swift-ci Please clean test tensorflow linux |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rename
clang-headerstoclang-resources-headers.Upstream patch: #27161
This fixes macOS toolchain builds via
build-toolchain-tensorflow.