Skip to content

[bazel][NFC] Avoid set for older bazel versions #170758

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
rupprecht merged 1 commit into from
Dec 4, 2025
+5 −4
Merged

[bazel][NFC] Avoid set for older bazel versions #170758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions utils/bazel/configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ DEFAULT_TARGETS = [
"XCore",
]


MAX_TRAVERSAL_STEPS = 1000000 # "big number" upper bound on total visited dirs

def _overlay_directories(repository_ctx):
Expand All @@ -44,7 +43,9 @@ def _overlay_directories(repository_ctx):
for _ in range(MAX_TRAVERSAL_STEPS):
rel_dir = stack.pop()

overlay_dirs = set()
# TODO: `set()` is only available in bazel 8.1.
# Use `set()` after downstream users are on more recent versions.
overlay_dirs = {}

# Symlink overlay files, overlay dirs will be handled in future iterations.
for entry in overlay_root.get_child(rel_dir).readdir():
Expand All @@ -53,7 +54,7 @@ def _overlay_directories(repository_ctx):

if entry.is_dir:
stack.append(full_rel_path)
overlay_dirs.add(name)
overlay_dirs[name] = None
else:
src_path = overlay_root.get_child(full_rel_path)
dst_path = target_root.get_child(full_rel_path)
Expand All @@ -62,7 +63,7 @@ def _overlay_directories(repository_ctx):
# Symlink source dirs (if not themselves overlaid) and files.
for src_entry in src_root.get_child(rel_dir).readdir():
name = src_entry.basename
if name in overlay_dirs:
if name in overlay_dirs.keys():
# Skip: overlay has a directory with this name
continue

Expand Down
Loading