Skip to content
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

Set USE_CLANG_CL=1 to force substitute llvm tools #88

Merged
merged 7 commits into from
Aug 21, 2020
Merged

Set USE_CLANG_CL=1 to force substitute llvm tools #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83f611a
Set USE_CLANG_CL=1 to force substitute llvm tools
wrowe Jul 24, 2020
a90e7d9
Merge remote-tracking branch 'origin/master' into clang-cl-add-env-var
wrowe Aug 5, 2020
540d799
Merge branch 'master' into clang-cl-add-env-var
sunjayBhatia Aug 11, 2020
aff02b9
Merge branch 'master' into clang-cl-add-env-var
sunjayBhatia Aug 13, 2020
b7399d8
No change, tickle CI to work around unexpected failure
wrowe Aug 13, 2020
57d909e
Bump bazel-toolchains to pick up fix
sunjayBhatia Aug 14, 2020
bbfbc8c
Merge branch 'master' into clang-cl-add-env-var
sunjayBhatia Aug 21, 2020
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
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "bazel_toolchains",
sha256 = "882fecfc88d3dc528f5c5681d95d730e213e39099abff2e637688a91a9619395",
strip_prefix = "bazel-toolchains-3.4.0",
urls = ["https://github.com/bazelbuild/bazel-toolchains/releases/download/3.4.0/bazel-toolchains-3.4.0.tar.gz"],
sha256 = "09642745581d071c7cd670e57589ea1ba78c99e9d7edb8b7478bda2640773e90",
strip_prefix = "bazel-toolchains-022dcbb331a80548cefecc289f3741b98b882307",
urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/022dcbb331a80548cefecc289f3741b98b882307.tar.gz"],
)

load(
Expand Down
4 changes: 3 additions & 1 deletion toolchains/rbe_toolchains_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ _GCC_ENV = {

_MSVC_CL_ENV = {}

_CLANG_CL_ENV = {}
_CLANG_CL_ENV = {
"USE_CLANG_CL": "1",
}

_TOOLCHAIN_CONFIG_SUITE_SPEC_LINUX = {
"container_registry": _ENVOY_BUILD_IMAGE_REGISTRY,
Expand Down