Skip to content

Remove legacy CC_TOOLCHAIN_ATTRS #2019

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

Open
phst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove legacy CC_TOOLCHAIN_ATTRS #2019

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
8 changes: 3 additions & 5 deletions elisp/elisp_binary.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2025 Google LLC
# Copyright 2020-2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@

"""Defines the `elisp_binary` rule."""

load("@rules_cc//cc:use_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "use_cc_toolchain")
load("@rules_cc//cc:use_cc_toolchain.bzl", "use_cc_toolchain")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("//elisp/common:elisp_info.bzl", "EmacsLispInfo")
load("//elisp/private:binary.bzl", "binary")
Expand Down Expand Up @@ -49,10 +49,8 @@ def _elisp_binary_impl(ctx):
]

elisp_binary = rule(
# FIXME: Remove CC_TOOLCHAIN_ATTRS once
# https://github.com/bazelbuild/bazel/issues/7260 is fixed.
# @unsorted-dict-items
attrs = CC_TOOLCHAIN_ATTRS | COMPILE_ATTRS | {
attrs = COMPILE_ATTRS | {
"src": attr.label(
doc = "Source file to load.",
allow_single_file = [".el"],
Expand Down
8 changes: 3 additions & 5 deletions elisp/elisp_cc_module.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2025 Google LLC
# Copyright 2020-2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
"""Defines the `elisp_cc_module` rule."""

load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
load("@rules_cc//cc:use_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "use_cc_toolchain")
load("@rules_cc//cc:use_cc_toolchain.bzl", "use_cc_toolchain")
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("//elisp/common:elisp_info.bzl", "EmacsLispInfo")
Expand Down Expand Up @@ -141,10 +141,8 @@ using
```

to implement module functions.""",
# FIXME: Remove CC_TOOLCHAIN_ATTRS once
# https://github.com/bazelbuild/bazel/issues/7260 is fixed.
# @unsorted-dict-items
attrs = CC_TOOLCHAIN_ATTRS | {
attrs = {
"srcs": attr.label_list(
doc = """C and C++ source files for the module.
See the [corresponding attribute for
Expand Down
8 changes: 3 additions & 5 deletions elisp/elisp_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2025 Google LLC
# Copyright 2020-2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@

"""Defines the `elisp_test` rule."""

load("@rules_cc//cc:use_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "use_cc_toolchain")
load("@rules_cc//cc:use_cc_toolchain.bzl", "use_cc_toolchain")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("//elisp/common:elisp_info.bzl", "EmacsLispInfo")
load("//elisp/private:binary.bzl", "binary")
Expand Down Expand Up @@ -91,10 +91,8 @@ def _elisp_test_impl(ctx):
]

elisp_test = rule(
# FIXME: Remove CC_TOOLCHAIN_ATTRS once
# https://github.com/bazelbuild/bazel/issues/7260 is fixed.
# @unsorted-dict-items
attrs = CC_TOOLCHAIN_ATTRS | COMPILE_ATTRS | {
attrs = COMPILE_ATTRS | {
"srcs": attr.label_list(
allow_empty = False,
doc = "List of source files to load.",
Expand Down
6 changes: 2 additions & 4 deletions elisp/toolchains/elisp_emacs_binary.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Bazel."""

load("@bazel_skylib//lib:paths.bzl", "paths")
load("@rules_cc//cc:action_names.bzl", "CPP_LINK_EXECUTABLE_ACTION_NAME", "C_COMPILE_ACTION_NAME")
load("@rules_cc//cc:use_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "use_cc_toolchain")
load("@rules_cc//cc:use_cc_toolchain.bzl", "use_cc_toolchain")
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("//elisp/private:cc_default_info.bzl", "CcDefaultInfo")
Expand Down Expand Up @@ -69,10 +69,8 @@ def _elisp_emacs_binary_impl(ctx):
]

elisp_emacs_binary = rule(
# FIXME: Remove CC_TOOLCHAIN_ATTRS once
# https://github.com/bazelbuild/bazel/issues/7260 is fixed.
# @unsorted-dict-items
attrs = CC_TOOLCHAIN_ATTRS | LAUNCHER_ATTRS | {
attrs = LAUNCHER_ATTRS | {
"mode": attr.string(
doc = """How to build and install Emacs. Possible values are:
- `source`: Build Emacs from sources using `configure` and `make install`.
Expand Down
Loading