Skip to content

Commit c138210

Browse files
buildbreaker2021copybara-github
authored andcommitted
Prepare to move CcModule to builtins.
PiperOrigin-RevId: 513236171 Change-Id: I9fca806aef9c88ab1dbb874c1b1c88f0e661a382
1 parent 661ebef commit c138210

16 files changed

+33
-18
lines changed

src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ load(":common/cc/semantics.bzl", "semantics")
1818
load(":common/cc/experimental_cc_shared_library.bzl", "GraphNodeInfo", "build_exports_map_from_only_dynamic_deps", "build_link_once_static_libs_map", "merge_cc_shared_library_infos", "throw_linked_but_not_exported_errors")
1919
load(":common/cc/cc_helper.bzl", "cc_helper", "linker_mode")
2020
load(":common/cc/cc_info.bzl", "CcInfo")
21+
load(":common/cc/cc_common.bzl", "cc_common")
2122

2223
DebugPackageInfo = _builtins.toplevel.DebugPackageInfo
23-
cc_common = _builtins.toplevel.cc_common
2424
cc_internal = _builtins.internal.cc_internal
2525
StaticallyLinkedMarkerInfo = _builtins.internal.StaticallyLinkedMarkerProvider
2626

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright 2023 The Bazel Authors. All rights reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
"""Utilites related to C++ support."""
16+
17+
cc_common = _builtins.toplevel.cc_common

src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
load(":common/objc/semantics.bzl", objc_semantics = "semantics")
1818
load(":common/paths.bzl", "paths")
1919
load(":common/cc/cc_info.bzl", "CcInfo")
20+
load(":common/cc/cc_common.bzl", "cc_common")
2021

21-
cc_common = _builtins.toplevel.cc_common
2222
cc_internal = _builtins.internal.cc_internal
2323
CcNativeLibraryInfo = _builtins.internal.CcNativeLibraryInfo
2424
config_common = _builtins.toplevel.config_common

src/main/starlark/builtins_bzl/common/cc/cc_import.bzl

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ rely on this. Pass the flag --experimental_starlark_cc_import
2121
load(":common/cc/cc_helper.bzl", "cc_helper")
2222
load(":common/objc/semantics.bzl", "semantics")
2323
load(":common/cc/cc_info.bzl", "CcInfo")
24-
25-
cc_common = _builtins.toplevel.cc_common
24+
load(":common/cc/cc_common.bzl", "cc_common")
2625

2726
CPP_LINK_STATIC_LIBRARY_ACTION_NAME = "c++-link-static-library"
2827

src/main/starlark/builtins_bzl/common/cc/cc_library.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
load(":common/cc/cc_helper.bzl", "cc_helper")
1818
load(":common/cc/semantics.bzl", "semantics")
1919
load(":common/cc/cc_info.bzl", "CcInfo")
20+
load(":common/cc/cc_common.bzl", "cc_common")
2021

21-
cc_common = _builtins.toplevel.cc_common
2222
cc_internal = _builtins.internal.cc_internal
2323

2424
def _cc_library_impl(ctx):

src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ load(":common/proto/proto_info.bzl", "ProtoInfo")
1818
load(":common/cc/cc_helper.bzl", "cc_helper")
1919
load(":common/proto/proto_common.bzl", "ProtoLangToolchainInfo", proto_common = "proto_common_do_not_use")
2020
load(":common/cc/cc_info.bzl", "CcInfo")
21-
22-
cc_common = _builtins.toplevel.cc_common
21+
load(":common/cc/cc_common.bzl", "cc_common")
2322

2423
ProtoCcFilesInfo = provider(fields = ["files"], doc = "Provide cc proto files.")
2524
ProtoCcHeaderInfo = provider(fields = ["headers"], doc = "Provide cc proto headers.")

src/main/starlark/builtins_bzl/common/cc/cc_toolchain_alias.bzl

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
load(":common/cc/semantics.bzl", "semantics")
1818
load(":common/cc/cc_helper.bzl", "cc_helper")
19+
load(":common/cc/cc_common.bzl", "cc_common")
1920

20-
CcToolchainInfo = _builtins.toplevel.cc_common.CcToolchainInfo
21+
CcToolchainInfo = cc_common.CcToolchainInfo
2122
TemplateVariableInfo = _builtins.toplevel.platform_common.TemplateVariableInfo
2223
ToolchainInfo = _builtins.toplevel.platform_common.ToolchainInfo
2324

src/main/starlark/builtins_bzl/common/cc/experimental_cc_shared_library.bzl

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ load(":common/cc/cc_helper.bzl", "cc_helper")
2323
load(":common/cc/semantics.bzl", "semantics")
2424
load(":common/proto/proto_info.bzl", "ProtoInfo")
2525
load(":common/cc/cc_info.bzl", "CcInfo")
26-
27-
cc_common = _builtins.toplevel.cc_common
26+
load(":common/cc/cc_common.bzl", "cc_common")
2827

2928
# TODO(#5200): Add export_define to library_to_link and cc_library
3029

src/main/starlark/builtins_bzl/common/exports.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ load("@_builtins//:common/python/providers.bzl", "PyCcLinkParamsProvider", "PyIn
3232
load("@_builtins//:common/java/proto/java_lite_proto_library.bzl", "java_lite_proto_library")
3333
load("@_builtins//:common/cc/cc_library.bzl", "cc_library")
3434
load("@_builtins//:common/cc/cc_toolchain_alias.bzl", "cc_toolchain_alias")
35+
load("@_builtins//:common/cc/cc_common.bzl", "cc_common")
3536

3637
exported_toplevels = {
3738
# This dummy symbol is not part of the public API; it is only used to test
@@ -45,6 +46,7 @@ exported_toplevels = {
4546
"PyCcLinkParamsProvider": PyCcLinkParamsProvider,
4647
"py_internal": py_internal,
4748
"ProtoInfo": ProtoInfo,
49+
"cc_common": cc_common,
4850
}
4951

5052
# A list of Starlarkified native rules.

src/main/starlark/builtins_bzl/common/java/java_helper.bzl

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
load(":common/java/java_semantics.bzl", "semantics")
1818
load(":common/cc/cc_helper.bzl", "cc_helper")
1919
load(":common/paths.bzl", "paths")
20-
21-
cc_common = _builtins.toplevel.cc_common
20+
load(":common/cc/cc_common.bzl", "cc_common")
2221

2322
def _collect_all_targets_as_runtime_deps(ctx):
2423
return _collect_all_targets_as_deps(ctx)

src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
load("@_builtins//:common/cc/cc_helper.bzl", "cc_helper")
1818
load("@_builtins//:common/objc/objc_common.bzl", "objc_common")
19+
load(":common/cc/cc_common.bzl", "cc_common")
1920

2021
objc_internal = _builtins.internal.objc_internal
21-
cc_common = _builtins.toplevel.cc_common
2222

2323
def _build_variable_extensions(ctx, arc_enabled):
2424
extensions = {}

src/main/starlark/builtins_bzl/common/objc/linking_support.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
load("@_builtins//:common/objc/compilation_support.bzl", "compilation_support")
1818
load(":common/cc/cc_info.bzl", "CcInfo")
19+
load(":common/cc/cc_common.bzl", "cc_common")
1920

20-
cc_common = _builtins.toplevel.cc_common
2121
apple_common = _builtins.toplevel.apple_common
2222
objc_internal = _builtins.internal.objc_internal
2323

src/main/starlark/builtins_bzl/common/objc/objc_import.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ load("@_builtins//:common/objc/attrs.bzl", "common_attrs")
1818
load("@_builtins//:common/objc/compilation_support.bzl", "compilation_support")
1919
load("@_builtins//:common/cc/cc_helper.bzl", "cc_helper")
2020
load(":common/cc/cc_info.bzl", "CcInfo")
21+
load(":common/cc/cc_common.bzl", "cc_common")
2122

2223
objc_internal = _builtins.internal.objc_internal
23-
cc_common = _builtins.toplevel.cc_common
2424

2525
def _objc_import_impl(ctx):
2626
cc_toolchain = cc_helper.find_cpp_toolchain(ctx)

src/main/starlark/builtins_bzl/common/objc/objc_library.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ load("@_builtins//:common/cc/cc_helper.bzl", "cc_helper")
2222
load(":common/cc/cc_info.bzl", "CcInfo")
2323

2424
objc_internal = _builtins.internal.objc_internal
25-
cc_common = _builtins.toplevel.cc_common
2625
coverage_common = _builtins.toplevel.coverage_common
2726
apple_common = _builtins.toplevel.apple_common
2827

src/main/starlark/builtins_bzl/common/python/common_bazel.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ load(":common/paths.bzl", "paths")
1717
load(":common/python/providers.bzl", "PyCcLinkParamsProvider")
1818
load(":common/python/common.bzl", "is_bool")
1919
load(":common/cc/cc_info.bzl", _CcInfo = "CcInfo")
20+
load(":common/cc/cc_common.bzl", _cc_common = "cc_common")
2021

2122
_py_builtins = _builtins.internal.py_builtins
22-
_cc_common = _builtins.toplevel.cc_common
2323

2424
def collect_cc_info(ctx, extra_deps = []):
2525
"""Collect C++ information from dependencies for Bazel.

src/main/starlark/builtins_bzl/common/python/py_executable.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ load(
4545
"IS_BAZEL",
4646
"PY_RUNTIME_ATTR_NAME",
4747
)
48+
load(":common/cc/cc_common.bzl", _cc_common = "cc_common")
4849

49-
_cc_common = _builtins.toplevel.cc_common
5050
_py_builtins = _builtins.internal.py_builtins
5151

5252
# Non-Google-specific attributes for executables

0 commit comments

Comments
 (0)