Skip to content

Modernize Bazel #204

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
merged 10 commits into from
Nov 20, 2025
Merged

Modernize Bazel #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b42ca8
Move buildifier to subfolder
martin4861 Nov 13, 2025
e81cdca
Proper load statements for binaries
martin4861 Nov 13, 2025
4616e9e
Update buildifier
martin4861 Nov 13, 2025
b0d3ef1
Use defs from rules_cc
martin4861 Nov 17, 2025
4ebdeb4
Use defs from rules_cc
martin4861 Nov 17, 2025
6b74852
Remove invalid attr
martin4861 Nov 17, 2025
de0ba9e
Add rules_cc
martin4861 Nov 17, 2025
aa14aa2
Load stuff from rules_cc
martin4861 Nov 17, 2025
3495a90
Run buildifier
martin4861 Nov 18, 2025
87cd7a4
Update MODULE.bazel.lock
martin4861 Nov 19, 2025
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: 3 additions & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "rules_cc", version = "0.2.14")
bazel_dep(name = "rules_pkg", version = "1.1.0")
bazel_dep(name = "rules_oci", version = "1.8.0")
bazel_dep(name = "rules_shell", version = "0.6.1")
bazel_dep(name = "rules_python", version = "1.6.3")

# Register module extensions
swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
Expand Down Expand Up @@ -67,6 +69,6 @@ use_repo(yocto_generic_ext, "yocto_generic")
# Register the buildifier toolchain
bazel_dep(
name = "buildifier_prebuilt",
version = "8.2.0.2",
version = "8.2.1",
dev_dependency = True,
)
52 changes: 48 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.

1 change: 1 addition & 0 deletions cc/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

load("@bazel_skylib//lib:selects.bzl", "selects")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
load("@rules_python//python:py_binary.bzl", "py_binary")

exports_files(
glob(["*.bzl"]),
Expand Down
1 change: 0 additions & 1 deletion cc/cc_static_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,4 @@ cc_static_library = rule(
),
},
toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
incompatible_use_toolchain_transition = True,
)
25 changes: 13 additions & 12 deletions cc/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

"""Swift wrappers for native cc rules."""

load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
load("//stamp:stamp_file.bzl", "stamp_file")
load(":cc_static_library.bzl", _cc_static_library = "cc_static_library")
load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS")
Expand Down Expand Up @@ -246,7 +247,7 @@ def swift_c_library(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_cc_library(**kwargs):
"""Wraps cc_library to enforce standards for a production c++ library.
Expand Down Expand Up @@ -299,7 +300,7 @@ def swift_cc_library(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_c_tool_library(**kwargs):
"""Wraps cc_library to enforce standards for a non-production c library.
Expand Down Expand Up @@ -343,7 +344,7 @@ def swift_c_tool_library(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_cc_tool_library(**kwargs):
"""Wraps cc_library to enforce standards for a non-production c++ library.
Expand Down Expand Up @@ -390,7 +391,7 @@ def swift_cc_tool_library(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_c_binary(**kwargs):
"""Wraps cc_binary to enforce standards for a production c binary.
Expand Down Expand Up @@ -438,7 +439,7 @@ def swift_c_binary(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_binary(**kwargs)
cc_binary(**kwargs)

def swift_cc_binary(**kwargs):
"""Wraps cc_binary to enforce standards for a production c++ binary.
Expand Down Expand Up @@ -488,7 +489,7 @@ def swift_cc_binary(**kwargs):

kwargs["tags"] = [BINARY] + kwargs.get("tags", [])

native.cc_binary(**kwargs)
cc_binary(**kwargs)

def swift_c_tool(**kwargs):
"""Wraps cc_binary to enforce standards for a non-production c binary.
Expand Down Expand Up @@ -531,7 +532,7 @@ def swift_c_tool(**kwargs):

kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))

native.cc_binary(**kwargs)
cc_binary(**kwargs)

def swift_cc_tool(**kwargs):
"""Wraps cc_binary to enforce standards for a non-production c++ binary.
Expand Down Expand Up @@ -577,7 +578,7 @@ def swift_cc_tool(**kwargs):

kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))

native.cc_binary(**kwargs)
cc_binary(**kwargs)

def swift_c_test_library(**kwargs):
"""Wraps cc_library to enforce Swift test library conventions.
Expand All @@ -604,7 +605,7 @@ def swift_c_test_library(**kwargs):
kwargs["tags"] = [TEST_LIBRARY] + kwargs.get("tags", [])
kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_cc_test_library(**kwargs):
"""Wraps cc_library to enforce Swift test library conventions.
Expand Down Expand Up @@ -635,7 +636,7 @@ def swift_cc_test_library(**kwargs):

kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))

native.cc_library(**kwargs)
cc_library(**kwargs)

def swift_c_test(name, type, **kwargs):
"""Wraps cc_test to enforce Swift testing conventions for C code.
Expand Down Expand Up @@ -690,7 +691,7 @@ def swift_c_test(name, type, **kwargs):
kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()

native.cc_test(**kwargs)
cc_test(**kwargs)

def swift_cc_test(name, type, **kwargs):
"""Wraps cc_test to enforce Swift testing conventions.
Expand Down Expand Up @@ -742,4 +743,4 @@ def swift_cc_test(name, type, **kwargs):
kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()

native.cc_test(**kwargs)
cc_test(**kwargs)
1 change: 1 addition & 0 deletions cc/toolchains/gcc_arm_embedded/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_DARWIN")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/unix_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo")
load(
"swift_custom_features.bzl",
"c11_standard_feature",
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_DARWIN")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/x86_64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_DARWIN")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/unix_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo")
load(
"swift_custom_features.bzl",
"c11_standard_feature",
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "X86_64_DARWIN")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "X86_64_LINUX")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm_x86_64_windows/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/musl/aarch64/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/musl/armhf/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/musl/x86_64/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/system_gcc/gcc11_x86_64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_cc//cc/private/toolchain:unix_cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/system_gcc/gcc12_x86_64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_cc//cc/private/toolchain:unix_cc_toolchain_config.bzl", "cc_toolchain_config")
load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")

Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/yocto_generic/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load(":config.bzl", "config")

filegroup(name = "empty")
Expand Down
1 change: 1 addition & 0 deletions cc_files/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@bazel_skylib//rules:common_settings.bzl", "string_list_flag")
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
load("@rules_swiftnav//tools:string_list_file.bzl", "string_list_file")

sh_binary(
Expand Down
1 change: 1 addition & 0 deletions clang_format/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
load(":choose_clang_format.bzl", "choose_clang_format")

filegroup(
Expand Down
1 change: 1 addition & 0 deletions clang_tidy/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
load(":choose_clang_tidy.bzl", "choose_clang_tidy")

choose_clang_tidy(
Expand Down
3 changes: 2 additions & 1 deletion examples/small_world/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module(name = "small_world")

bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "rules_cc", version = "0.2.4")
bazel_dep(name = "rules_swiftnav")
local_path_override(
module_name = "rules_swiftnav",
Expand Down Expand Up @@ -40,7 +41,7 @@ bazel_dep(name = "eigen", version = "5.0.0")
# Register the buildifier toolchain
bazel_dep(
name = "buildifier_prebuilt",
version = "8.2.0.2",
version = "8.2.1",
dev_dependency = True,
)

Expand Down
Loading