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

build: Bump compilation toolchain #465

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

build: Bump compilation toolchain #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a332c53
build: Bump compilation toolchain
varungandhi-src Mar 1, 2024
8a5431f
build: Downgrade LLVM 17.0.6 -> 16.0.0
varungandhi-src Mar 1, 2024
0028f3c
Reformat
varungandhi-src Mar 6, 2024
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
4 changes: 2 additions & 2 deletions indexer/Driver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ struct DriverOptions {
projectRootPath(AbsolutePath("/"), RootKind::Project), compdbPath(),
indexOutputPath(), statsFilePath(), packageMapPath(),
showCompilerDiagnostics(cliOpts.showCompilerDiagnostics),
showProgress(cliOpts.showProgress), ipcOptions{cliOpts.ipcSizeHintBytes,
cliOpts.receiveTimeout},
showProgress(cliOpts.showProgress),
ipcOptions{cliOpts.ipcSizeHintBytes, cliOpts.receiveTimeout},
numWorkers(cliOpts.numWorkers), deterministic(cliOpts.deterministic),
preprocessorRecordHistoryFilterRegex(
cliOpts.preprocessorRecordHistoryFilterRegex),
Expand Down
6 changes: 2 additions & 4 deletions settings.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Keep LLVM versions list in sync with setup_llvm.bzl
ASAN_LINKOPTS = [
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.6/lib/darwin",
# macOS release builds use 15.0.7 for x86_64
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.7/lib/darwin",
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.6/lib/linux",
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/16.0.0/lib/darwin",
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/16.0.0/lib/linux",
]
18 changes: 12 additions & 6 deletions setup_llvm.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ load("@toolchains_llvm//toolchain:rules.bzl", grailbio_llvm_toolchain = "llvm_to
def setup_llvm_toolchain(name):
# NOTE: The ASan build uses paths which involve the version.
# Keep the version list in sync with settings.bzl
# At the time of bumping this, the latest version is 17.0.6,
# but we use 16.0.0 because:
# - Versions later than 16.0.0 are built on Ubuntu 22.04 or newer,
# whereas 16.0.0 is built on Ubuntu 18.04. The newer binaries require
# a newer glibc version which isn't currently present on Buildkite machines.
# - Our release pipeline uses Ubuntu 18.04 so that the binaries work on
# older Debian and Ubuntu versions. Using newer toolchain binaries would
# hence not work in our release pipeline.
mapping = {
"linux-aarch64": {"version": "15.0.6", "triple": "aarch64-linux-gnu", "sha256": "8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec"},
"linux-x86_64": {"version": "15.0.6", "triple": "x86_64-linux-gnu-ubuntu-18.04", "sha256": "38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036"},
"darwin-aarch64": {"version": "15.0.6", "triple": "arm64-apple-darwin21.0", "sha256": "32bc7b8eee3d98f72dd4e5651e6da990274ee2d28c5c19a7d8237eb817ce8d91"},
"darwin-arm64": {"version": "15.0.6", "triple": "arm64-apple-darwin21.0", "sha256": "32bc7b8eee3d98f72dd4e5651e6da990274ee2d28c5c19a7d8237eb817ce8d91"},
"darwin-x86_64": {"version": "15.0.7", "triple": "x86_64-apple-darwin21.0", "sha256": "d16b6d536364c5bec6583d12dd7e6cf841b9f508c4430d9ee886726bd9983f1c"},
"windows": {"version": "15.0.6", "sha256": "22e2f2c38be4c44db7a1e9da5e67de2a453c5b4be9cf91e139592a63877ac0a2", "url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/LLVM-15.0.6-win64.exe"},
"linux-aarch64": {"version": "16.0.0", "triple": "aarch64-linux-gnu", "sha256": "b750ba3120e6153fc5b316092f19b52cf3eb64e19e5f44bd1b962cb54a20cf0a"},
"linux-x86_64": {"version": "16.0.0", "triple": "x86_64-linux-gnu-ubuntu-18.04", "sha256": "2b8a69798e8dddeb57a186ecac217a35ea45607cb2b3cf30014431cff4340ad1"},
"darwin-aarch64": {"version": "16.0.0", "triple": "arm64-apple-darwin22.0", "sha256": "2041587b90626a4a87f0de14a5842c14c6c3374f42c8ed12726ef017416409d9"},
"darwin-arm64": {"version": "16.0.0", "triple": "arm64-apple-darwin22.0", "sha256": "2041587b90626a4a87f0de14a5842c14c6c3374f42c8ed12726ef017416409d9"},
}
llvm_versions, sha256, strip_prefix, urls = {}, {}, {}, {}
for (k, v) in mapping.items():
Expand Down