Skip to content

Commit 011d6d9

Browse files
lilygorshenevacopybara-github
authored andcommitted
Expose merge_cc_info from cc_info.bzl
Once this change is *released* in rules_cc and rules_java updated to use the new version, we can update rules_java/java/private/java_info.bzl, preventing that from widely-loading cc_common. Compatibility mode loads native merge_cc_infos instead of the starlarked thing because when I tried forcing java_info to use cc_info.bzl's merge_cc_infos it failed on Bazel 8. PiperOrigin-RevId: 876268175 Change-Id: Ib1d8b75da74c474c287ea6a485a6795515df0d41
1 parent 9a390a7 commit 011d6d9

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

cc/common/cc_info.bzl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
# limitations under the License.
1414
"""CcInfo"""
1515

16-
load("@cc_compatibility_proxy//:symbols.bzl", _CcInfo = "CcInfo")
16+
load(
17+
"@cc_compatibility_proxy//:symbols.bzl",
18+
_CcInfo = "CcInfo",
19+
_merge_cc_infos = "merge_cc_infos",
20+
)
1721

1822
CcInfo = _CcInfo
23+
merge_cc_infos = _merge_cc_infos

cc/extensions.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,15 @@ cc_toolchain_alias = _cc_toolchain_alias
9393
"symbols.bzl",
9494
"""
9595
load("@rules_cc//cc/private:cc_common.bzl", _cc_common = "cc_common")
96-
load("@rules_cc//cc/private:cc_info.bzl", _CcInfo = "CcInfo")
96+
load("@rules_cc//cc/private:cc_info.bzl", _CcInfo = "CcInfo", _merge_cc_infos = "merge_cc_infos")
9797
load("@rules_cc//cc/private:cc_shared_library_info.bzl", _CcSharedLibraryInfo = "CcSharedLibraryInfo")
9898
load("@rules_cc//cc/private:debug_package_info.bzl", _DebugPackageInfo = "DebugPackageInfo")
9999
load("@rules_cc//cc/private:objc_info.bzl", _ObjcInfo = "ObjcInfo")
100100
load("@rules_cc//cc/private/toolchain_config:cc_toolchain_config_info.bzl", _CcToolchainConfigInfo = "CcToolchainConfigInfo")
101101
102102
cc_common = _cc_common
103103
CcInfo = _CcInfo
104+
merge_cc_infos = _merge_cc_infos
104105
DebugPackageInfo = _DebugPackageInfo
105106
CcToolchainConfigInfo = _CcToolchainConfigInfo
106107
ObjcInfo = _ObjcInfo
@@ -158,6 +159,7 @@ load("@rules_cc//cc/private/rules_impl:native_providers.bzl", "NativeCcToolchain
158159
load("@rules_cc//cc/private/rules_impl:native_providers.bzl", "NativeCcSharedLibraryInfo")
159160
cc_common = native_cc_common
160161
CcInfo = NativeCcInfo
162+
merge_cc_infos = cc_common.merge_cc_infos
161163
DebugPackageInfo = NativeDebugPackageInfo
162164
CcToolchainConfigInfo = NativeCcToolchainConfigInfo
163165
ObjcInfo = apple_common.Objc

0 commit comments

Comments
 (0)