Skip to content

Use Bzlmod as default #12161

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

Closed
wants to merge 1 commit into from
Closed

Use Bzlmod as default #12161

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ build:aarch64 --crosstool_top=@crosstool//:toolchains
build:aarch64 --cpu=aarch64
build:aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64

common --noenable_bzlmod
common --enable_workspace
common --enable_bzlmod
common --noenable_workspace
8 changes: 4 additions & 4 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ python.defaults(python_version = "3.11")
python.toolchain(python_version = "3.11")

### Crosstool
coral_crosstool_extension = use_extension("//:tools/bazeldefs/extensions/coral_crosstool.bzl", "coral_crosstool_extension")
coral_crosstool_extension = use_extension("//tools/bazeldefs:extensions/coral_crosstool.bzl", "coral_crosstool_extension")
use_repo(coral_crosstool_extension, "coral_crosstool")

crosstool = use_extension("//:tools/bazeldefs/extensions/crosstool.bzl", "crosstool_extension")
crosstool = use_extension("//tools/bazeldefs:extensions/crosstool.bzl", "crosstool_extension")
use_repo(crosstool, "crosstool")

### zlib-ng
# TODO: try using "zlib-ng" from BCR
llvm_zlib = use_extension("//:tools/bazeldefs/extensions/llvm_zlib.bzl", "llvm_zlib_extension")
# TODO: try using "zlib-ng" from BCR once llvm-raw is used directly from BCR
llvm_zlib = use_extension("//tools/bazeldefs:extensions/llvm_zlib.bzl", "llvm_zlib_extension")
use_repo(llvm_zlib, "llvm_zlib")

### Repo rules
Expand Down
7 changes: 1 addition & 6 deletions tools/bazeldefs/extensions/crosstool.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@

load("@coral_crosstool//:configure.bzl", "cc_crosstool")

def _crosstool_impl(ctx):
cc_crosstool(
name = "crosstool",
c_version = "gnu17",
)

crosstool_extension = module_extension(
implementation = _crosstool_impl,
implementation = lambda mctx: cc_crosstool(name = "crosstool", c_version = "gnu17"),
)
Loading