Skip to content

Bump toolchains_llvm to 1.11.2, drop #791 archive_override #423

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

Merged
zzcgumn merged 25 commits into from
Oct 16, 2026
Merged

Bump toolchains_llvm to 1.11.2, drop #791 archive_override #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
94c544d
Bump toolchains_llvm to 1.11.2, dropping the #791 archive_override.
zzcgumn Oct 10, 2026
0c9ec92
Cover local_path_override and multiple_version_override in the toolch…
zzcgumn Oct 10, 2026
ccf2a1f
Parse bazel_dep's toolchains_llvm version independently of argument o…
zzcgumn Oct 10, 2026
1a817e8
Use a balanced-paren/string/comment-aware scanner for call bodies.
zzcgumn Oct 10, 2026
58d3db7
Ignore commented-out MODULE.bazel calls in the call-body scanner.
zzcgumn Oct 10, 2026
8e10887
Tolerate whitespace before "(" and mask comments out of call bodies.
zzcgumn Oct 10, 2026
d10df56
Parse real keyword=value tokens instead of regex-searching masked bod…
zzcgumn Oct 10, 2026
252d8c1
Handle triple-quoted strings and identifier boundaries correctly.
zzcgumn Oct 10, 2026
a319902
Capture positional module_name/name arguments, not just keyword form.
zzcgumn Oct 10, 2026
3de290b
Extract triple-quoted string values instead of discarding them.
zzcgumn Oct 10, 2026
35dd67b
Decode Starlark backslash escapes instead of stripping the backslash.
zzcgumn Oct 10, 2026
5bcd584
Decode Starlark \u/\U Unicode escapes in module_name values.
zzcgumn Oct 10, 2026
f28d7b9
Fail closed on a non-literal module_name in override detection.
zzcgumn Oct 11, 2026
2490fd9
Fail closed for any incomplete literal, not just one followed by "+".
zzcgumn Oct 11, 2026
c2cff83
Fail closed on a parenthesized positional module_name expression.
zzcgumn Oct 11, 2026
425e2fd
Fail closed on list/dict positional module_name expressions.
zzcgumn Oct 12, 2026
ed28e60
Skip comments, not just whitespace, between "=" and a keyword's RHS.
zzcgumn Oct 12, 2026
29c5d11
Recognize a parenthesized-callable-indirection call form.
zzcgumn Oct 12, 2026
3dc70b2
Decode backslash-newline line continuations instead of keeping both.
zzcgumn Oct 12, 2026
dedcc23
Handle comments in grouped-call detection; recognize raw strings.
zzcgumn Oct 12, 2026
993d99c
Handle triple-quote delimiters in raw string literals.
zzcgumn Oct 13, 2026
8b90637
Unwrap nested grouped-callable parens; mirror two fixes from #424.
zzcgumn Oct 15, 2026
e1dfdbf
Skip backslash-newline continuations; mirror two fixes from #424.
zzcgumn Oct 15, 2026
4dc017e
Mirror #424's comment-before-"(" and nested-override-call fixes.
zzcgumn Oct 16, 2026
1452404
Mirror #424: exclude spaced attribute calls; classify arguments once.
zzcgumn Oct 16, 2026
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
17 changes: 1 addition & 16 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
bazel_dep(name = "pybind11_bazel", version = "3.0.1")
bazel_dep(name = "rules_python", version = "2.0.1")
# 1.8.0+ adds --features=msan and libcxx_url for an instrumented libc++ overlay.
# BCR 1.8.0 still emits unused `-stdlib=libc++` under `-nostdinc++`, which fails
# our Linux `-Werror` builds. Override to the #791 fix until BCR publishes >1.8.0.
bazel_dep(name = "toolchains_llvm", version = "1.8.0")
bazel_dep(name = "toolchains_llvm", version = "1.11.2")
Comment thread
tameware marked this conversation as resolved.

# Xcode CC toolchain for macOS AddressSanitizer builds (--config=asan). LLVM's ASAN
# runtime hangs on current macOS; see .bazelrc build:asan_macos.
Expand Down Expand Up @@ -70,19 +68,6 @@ archive_override(
],
)

# toolchains_llvm#791: drop redundant `-stdlib=libc++` (unused with `-nostdinc++`).
# Commit is the merge of that PR; drop this override when BCR ships a release
# that includes it.
archive_override(
module_name = "toolchains_llvm",
integrity = "sha256-spaFpVBa8JGs27s/9vk0Xb4gd8fJ9OFmnxaBYPeOt4o=",
strip_prefix = "toolchains_llvm-c3ac93f5c61cb78487765d2e81e7485ad3f8bf2c",
urls = [
"https://github.com/bazel-contrib/toolchains_llvm/archive/c3ac93f5c61cb78487765d2e81e7485ad3f8bf2c.tar.gz",
"https://codeload.github.com/bazel-contrib/toolchains_llvm/tar.gz/c3ac93f5c61cb78487765d2e81e7485ad3f8bf2c",
],
)

llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
llvm.toolchain(
name = "llvm_toolchain",
Expand Down
10 changes: 6 additions & 4 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions docs/BUILD_SYSTEM.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,6 @@ libc++ overlay (`libcxx_url` / `libcxx_sha256` in `MODULE.bazel`) built against
the same Ubuntu 22.04 LLVM release as `MSAN_LLVM_VERSION`. Keep those pins
aligned when bumping LLVM. Do not combine MSAN with ASAN/TSAN/UBSAN.

`MODULE.bazel` currently `archive_override`s `toolchains_llvm` past BCR 1.8.0
to include [#791](https://github.com/bazel-contrib/toolchains_llvm/pull/791)
(drops unused `-stdlib=libc++` that breaks Linux `-Werror` builds). Drop the
override when BCR publishes a release that includes that fix.

**When upgrading LLVM or Xcode**, update all coupled paths together:

1. Bump `llvm_versions` in `MODULE.bazel` (and run
Expand Down
Loading
Loading