Skip to content

Commit

Permalink
Reland "Add new darwin CC toolchain for tests (#3460)" (#3502)
Browse files Browse the repository at this point in the history
This relands cd98170, which was
reverted by commit 4660427.

The Xcode toolchain is now only enabled in tests.
  • Loading branch information
fmeum committed Mar 29, 2023
1 parent 7eb61dc commit b39f91d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ tasks:
macos:
shell_commands:
- tests/core/cgo/generate_imported_dylib.sh
build_flags:
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
- "--crosstool_top=@local_config_apple_cc//:toolchain"
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
build_targets:
- "//..."
test_flags:
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
- "--crosstool_top=@local_config_apple_cc//:toolchain"
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
test_targets:
- "//..."
rbe_ubuntu1604:
Expand Down
14 changes: 14 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,17 @@ http_archive(
load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")

stardoc_repositories()

# For testing objc_library interop, users should not need to install it
http_archive(
name = "build_bazel_apple_support",
sha256 = "77a121a0f5d4cd88824429464ad2bfb54bdc8a3bccdb4d31a6c846003a3f5e44",
url = "https://github.com/bazelbuild/apple_support/releases/download/1.4.1/apple_support.1.4.1.tar.gz",
)

load(
"@build_bazel_apple_support//lib:repositories.bzl",
"apple_support_dependencies",
)

apple_support_dependencies()

0 comments on commit b39f91d

Please sign in to comment.