File tree Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -17,11 +17,11 @@ matrix:
1717 dist : trusty
1818 sudo : required
1919 env :
20- - BAZEL=0.13.0 SWIFT_VERSION=4.1.2 TARGETS="//examples/... -//examples/apple/..."
20+ - BAZEL=0.14.1 SWIFT_VERSION=4.1.2 TARGETS="//examples/... -//examples/apple/..."
2121 - os : osx
2222 osx_image : xcode9.3
2323 env :
24- - BAZEL=0.13.0 TARGETS=//examples/...
24+ - BAZEL=0.14.1 TARGETS=//examples/...
2525
2626before_install :
2727 - .travis/install.sh
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ function install_bazel() {
6666 chmod +x " $HOME /bin/bazel"
6767 else
6868 wget -O install.sh \
69- " https://github.com/bazelbuild/bazel/releases/download/${VERSION} /bazel-${VERSION} -without-jdk- installer-${OS} -x86_64.sh"
69+ " https://github.com/bazelbuild/bazel/releases/download/${VERSION} /bazel-${VERSION} -installer-${OS} -x86_64.sh"
7070 chmod +x install.sh
7171 ./install.sh --user
7272 rm -f install.sh
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ repository.
2323
2424## Compatibility
2525
26- These rules have been verified to work with ** Bazel 0.13.0 .**
26+ These rules have been verified to work with ** Bazel 0.14.1 .**
2727
2828## Quick Setup
2929
Original file line number Diff line number Diff line change @@ -92,7 +92,8 @@ def _swift_binary_test_impl(ctx):
9292 # TODO(b/70228246): Also support mostly-static and fully-dynamic modes.
9393 if toolchain .cc_toolchain_info :
9494 cpp_toolchain = find_cpp_toolchain (ctx )
95- if hasattr (cpp_toolchain , "link_options_do_not_use" ):
95+ if (hasattr (cpp_toolchain , "link_options_do_not_use" ) and
96+ hasattr (cc_common , "mostly_static_link_options" )):
9697 # We only do this for non-Xcode toolchains at this time.
9798 features = ctx .features
9899 link_args .add (find_cpp_toolchain (ctx ).link_options_do_not_use )
You can’t perform that action at this time.
0 commit comments