Skip to content

Commit 11a31d1

Browse files
committed
[bazel] Fix constant exports
`BUILD` files should now be using `defs.bzl` for these, so we don't need to export them from other files too. Signed-off-by: James Wainwright <[email protected]> (cherry picked from commit ea4702e)
1 parent ef1fa80 commit 11a31d1

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

rules/opentitan/cc.bzl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
# Licensed under the Apache License, Version 2.0, see LICENSE for details.
33
# SPDX-License-Identifier: Apache-2.0
44

5-
load(
6-
"@lowrisc_opentitan//rules:rv.bzl",
7-
"rv_rule",
8-
_OPENTITAN_CPU = "OPENTITAN_CPU",
9-
_OPENTITAN_PLATFORM = "OPENTITAN_PLATFORM",
10-
_opentitan_transition = "opentitan_transition",
11-
)
125
load(
136
"@lowrisc_opentitan//rules/opentitan:transform.bzl",
147
"convert_to_vmem",
@@ -18,16 +11,11 @@ load(
1811
load("@lowrisc_opentitan//rules:signing.bzl", "sign_binary")
1912
load("@lowrisc_opentitan//rules/opentitan:exec_env.bzl", "ExecEnvInfo")
2013
load("@lowrisc_opentitan//rules/opentitan:util.bzl", "get_fallback", "get_override")
14+
load("@lowrisc_opentitan//rules:rv.bzl", "rv_rule")
2115
load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
2216
load("//rules/opentitan:toolchain.bzl", "LOCALTOOLS_TOOLCHAIN")
2317
load("//rules/opentitan:util.bzl", "assemble_for_test")
2418

25-
# Re-exports of names from transition.bzl; many files in the repo use opentitan.bzl
26-
# to get to them.
27-
OPENTITAN_CPU = _OPENTITAN_CPU
28-
OPENTITAN_PLATFORM = _OPENTITAN_PLATFORM
29-
opentitan_transition = _opentitan_transition
30-
3119
def _expand(ctx, name, items):
3220
"""Perform location and make_variable expansion on a list of items.
3321

rules/opentitan/defs.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ load(
6666
# and opentitan_binary rules.
6767
CLEAR_KEY_SET = {"//signing:none_key": "none_key"}
6868

69-
# Re-exports of names from transition.bzl; many files in the repo use opentitan.bzl
70-
# to get to them.
69+
# Re-exports of names from transition.bzl
7170
OPENTITAN_CPU = _OPENTITAN_CPU
7271
OPENTITAN_PLATFORM = _OPENTITAN_PLATFORM
7372
opentitan_transition = _opentitan_transition

0 commit comments

Comments
 (0)