Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ build:release-linux-aarch64 --copt=-march=armv8.1a
build:release-mac --config=release-common --config=shared-libs

build:cross-to-darwin-x86_64 --platforms=@//tools/platforms:darwin_x86_64
build:cross-to-darwin-x86_64 --extra_toolchains=@llvm_toolchain_15_0_7//:cc-toolchain-x86_64-darwin
build:cross-to-darwin-x86_64 --extra_toolchains=@llvm_toolchain_16_0_5//:cc-toolchain-x86_64-darwin
build:cross-to-darwin-x86_64 --copt=-stdlib=libc++ --linkopt=-lc++

build:cross-to-darwin-arm64 --platforms=@//tools/platforms:darwin_arm64
build:cross-to-darwin-arm64 --extra_toolchains=@llvm_toolchain_15_0_7//:cc-toolchain-aarch64-darwin
build:cross-to-darwin-arm64 --extra_toolchains=@llvm_toolchain_16_0_5//:cc-toolchain-aarch64-darwin
build:cross-to-darwin-arm64 --copt=-stdlib=libc++ --linkopt=-lc++

build:release-debug-linux --config=release-linux
Expand Down Expand Up @@ -245,9 +245,9 @@ build:ubsan --copt=-DHAS_SANITIZER
# because we're using the toolchain's lld linker now.
# We could consider replacing this with something more typical.
# Original motivation: Bazel links C++ files with $CC, not $CXX, this breaks UBSan
build:sanitize-linux --linkopt=../../external/llvm_toolchain_15_0_7_llvm/lib/clang/15.0.7/lib/x86_64-unknown-linux-gnu/libclang_rt.asan_cxx.a
build:sanitize-linux --linkopt=../../external/llvm_toolchain_15_0_7_llvm/lib/clang/15.0.7/lib/x86_64-unknown-linux-gnu/libclang_rt.ubsan_standalone_cxx.a
build:sanitize-linux --linkopt=../../external/llvm_toolchain_15_0_7_llvm/lib/clang/15.0.7/lib/x86_64-unknown-linux-gnu/libclang_rt.ubsan_standalone.a
build:sanitize-linux --linkopt=../../external/llvm_toolchain_16_0_5_llvm/lib/clang/16/lib/x86_64-unknown-linux-gnu/libclang_rt.asan_cxx.a
build:sanitize-linux --linkopt=../../external/llvm_toolchain_16_0_5_llvm/lib/clang/16/lib/x86_64-unknown-linux-gnu/libclang_rt.ubsan_standalone_cxx.a
build:sanitize-linux --linkopt=../../external/llvm_toolchain_16_0_5_llvm/lib/clang/16/lib/x86_64-unknown-linux-gnu/libclang_rt.ubsan_standalone.a
build:sanitize-linux --config=sanitize

build:sanitize-mac --config=sanitize
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ You are encouraged to play around with various clang-based tools which use the

After successfully compiling Sorbet, point your editor to use the
`clangd` executable located in
`bazel-sorbet/external/llvm_toolchain_15_0_7/bin/clangd`.
`bazel-sorbet/external/llvm_toolchain_16_0_5/bin/clangd`.

- [clang-format] -- Clang-based source code formatter

Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ bazel_toolchain_dependencies()
load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")

llvm_toolchain(
name = "llvm_toolchain_15_0_7",
name = "llvm_toolchain_16_0_5",
absolute_paths = True,
alternative_llvm_sources = [
"https://github.com/sorbet/llvm-project/releases/download/llvmorg-{llvm_version}/{basename}",
],
llvm_version = "15.0.7",
llvm_version = "16.0.5",
# The sysroots are needed for cross-compiling
sysroot = {
"": "",
Expand All @@ -50,7 +50,7 @@ llvm_toolchain(
},
)

load("@llvm_toolchain_15_0_7//:toolchains.bzl", "llvm_register_toolchains")
load("@llvm_toolchain_16_0_5//:toolchains.bzl", "llvm_register_toolchains")

llvm_register_toolchains()

Expand Down
2 changes: 1 addition & 1 deletion test/cli/test_one.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ script="$1"
expect="$2"
update="$3"

export ASAN_SYMBOLIZER_PATH=`pwd`/external/llvm_toolchain_15_0_7/bin/llvm-symbolizer
export ASAN_SYMBOLIZER_PATH=`pwd`/external/llvm_toolchain_16_0_5/bin/llvm-symbolizer

if ! diff "$expect" -u <("$script"); then
cat <<EOF
Expand Down
2 changes: 1 addition & 1 deletion test/pipeline_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def dropExtension(p):
return p.partition(".")[0]

_TEST_SCRIPT = """#!/usr/bin/env bash
export ASAN_SYMBOLIZER_PATH=`pwd`/external/llvm_toolchain_15_0_7/bin/llvm-symbolizer
export ASAN_SYMBOLIZER_PATH=`pwd`/external/llvm_toolchain_16_0_5/bin/llvm-symbolizer
set -x
exec {runner} --single_test="{test}" {parser}
"""
Expand Down
2 changes: 1 addition & 1 deletion tools/clang.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ _clang_tool = rule(
def clang_tool(name):
_clang_tool(
name = name,
tool = "@llvm_toolchain_15_0_7//:bin/" + name,
tool = "@llvm_toolchain_16_0_5//:bin/" + name,
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion tools/scripts/fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ echo "building $target"
./bazel build "//test/fuzz:$target" --config=fuzz -c opt

# we want the bazel build command to run before this check so that bazel can download itself.
export PATH="$PATH:$PWD/bazel-sorbet/external/llvm_toolchain_15_0_7/bin"
export PATH="$PATH:$PWD/bazel-sorbet/external/llvm_toolchain_16_0_5/bin"
if ! command -v llvm-symbolizer >/dev/null; then
echo "fatal: command not found: llvm-symbolizer"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/fuzz_minimize_crash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ handle_TERM() {
trap handle_INT SIGINT
trap handle_TERM SIGTERM

export PATH="$PATH:$PWD/bazel-sorbet/external/llvm_toolchain_15_0_7/bin"
export PATH="$PATH:$PWD/bazel-sorbet/external/llvm_toolchain_16_0_5/bin"
if ! command -v llvm-symbolizer >/dev/null; then
echo "fatal: command not found: llvm-symbolizer"
exit 1
Expand Down
Loading