Skip to content

Commit d2133c2

Browse files
committed
fix lint
1 parent a0820ab commit d2133c2

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ build --cxxopt -Wformat-security
5959
build:clang-asan-ci --config=asan
6060
build:clang-asan-ci --linkopt='-L/usr/lib/llvm/lib/x86_64-unknown-linux-gnu'
6161
build:clang-asan-ci --linkopt='-Wl,-rpath,/usr/lib/llvm/lib/x86_64-unknown-linux-gnu'
62-
build:clang-asan-ci --linkopt='-L/usr/lib/llvm/lib/clang/14.0.0/lib/x86_64-unknown-linux-gnu'
62+
build:clang-asan-ci --linkopt='-L/usr/lib/llvm/lib/clang/18/lib/x86_64-unknown-linux-gnu'
6363

6464
build:clang-tsan-ci --config=tsan
6565
build:clang-tsan-ci --linkopt=-L/opt/libcxx_tsan/lib

WORKSPACE

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,29 +78,32 @@ load("@envoy//bazel:repo.bzl", "envoy_repo")
7878

7979
envoy_repo()
8080

81+
load("@envoy//bazel:toolchains.bzl", "envoy_toolchains")
8182

82-
# this's workaround for use local LLVM toolchain
83-
load("@envoy_repo//:compiler.bzl", "LLVM_PATH")
84-
load("@envoy_toolshed//repository:utils.bzl", "arch_alias")
85-
load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
86-
87-
register_toolchains("@envoy//bazel/rbe/toolchains/configs/linux/gcc/config:cc-toolchain")
88-
89-
arch_alias(
90-
name = "clang_platform",
91-
aliases = {
92-
"amd64": "@envoy//bazel/platforms/rbe:linux_x64",
93-
"aarch64": "@envoy//bazel/platforms/rbe:linux_arm64",
94-
},
95-
)
96-
97-
llvm_toolchain(
98-
name = "llvm_toolchain",
99-
cxx_standard = {"": "c++20"},
100-
llvm_version = "18.1.8",
101-
toolchain_roots = {"": LLVM_PATH} if LLVM_PATH else {},
102-
)
103-
104-
load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
83+
envoy_toolchains()
10584

106-
llvm_register_toolchains()
85+
# this's workaround for use local LLVM toolchain
86+
# load("@envoy_repo//:compiler.bzl", "LLVM_PATH")
87+
# load("@envoy_toolshed//repository:utils.bzl", "arch_alias")
88+
# load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
89+
90+
# register_toolchains("@envoy//bazel/rbe/toolchains/configs/linux/gcc/config:cc-toolchain")
91+
92+
# arch_alias(
93+
# name = "clang_platform",
94+
# aliases = {
95+
# "amd64": "@envoy//bazel/platforms/rbe:linux_x64",
96+
# "aarch64": "@envoy//bazel/platforms/rbe:linux_arm64",
97+
# },
98+
# )
99+
100+
# llvm_toolchain(
101+
# name = "llvm_toolchain",
102+
# cxx_standard = {"": "c++20"},
103+
# llvm_version = "18.1.8",
104+
# toolchain_roots = {"": LLVM_PATH} if LLVM_PATH else {},
105+
# )
106+
107+
# load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
108+
109+
# llvm_register_toolchains()

0 commit comments

Comments
 (0)