Skip to content

Commit 8826e2a

Browse files
fmeumjacqueline.lee
authored andcommitted
Reland "Add new darwin CC toolchain for tests (bazel-contrib#3460)" (bazel-contrib#3502)
This relands cd98170, which was reverted by commit 4660427. The Xcode toolchain is now only enabled in tests.
1 parent 7077d35 commit 8826e2a

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

.bazelci/presubmit.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,16 @@ tasks:
4343
macos:
4444
shell_commands:
4545
- tests/core/cgo/generate_imported_dylib.sh
46+
build_flags:
47+
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
48+
- "--crosstool_top=@local_config_apple_cc//:toolchain"
49+
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
4650
build_targets:
4751
- "//..."
52+
test_flags:
53+
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
54+
- "--crosstool_top=@local_config_apple_cc//:toolchain"
55+
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
4856
test_targets:
4957
- "//..."
5058
rbe_ubuntu1604:

WORKSPACE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,17 @@ http_archive(
165165
load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
166166

167167
stardoc_repositories()
168+
169+
# For testing objc_library interop, users should not need to install it
170+
http_archive(
171+
name = "build_bazel_apple_support",
172+
sha256 = "77a121a0f5d4cd88824429464ad2bfb54bdc8a3bccdb4d31a6c846003a3f5e44",
173+
url = "https://github.com/bazelbuild/apple_support/releases/download/1.4.1/apple_support.1.4.1.tar.gz",
174+
)
175+
176+
load(
177+
"@build_bazel_apple_support//lib:repositories.bzl",
178+
"apple_support_dependencies",
179+
)
180+
181+
apple_support_dependencies()

0 commit comments

Comments
 (0)