Skip to content

Use Starlark tuples for C++ object-file groups #814

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
dzbarsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Starlark tuples for C++ object-file groups #814

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
7 changes: 3 additions & 4 deletions cc/private/link/create_libraries_to_link_values.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"""Goes over LibraryToLinks and produces LibraryToLinkValue-s."""

load("//cc/common:cc_helper_internal.bzl", "is_shared_library", "is_versioned_shared_library", "root_relative_path")
load("//cc/private:cc_internal.bzl", _cc_internal = "cc_internal")

# Types of LibraryToLinkValues
_TYPE = struct(
Expand Down Expand Up @@ -59,7 +58,7 @@ def add_object_files_to_link(object_files, libraries_to_link_values):
libraries_to_link_values.append(
_ObjectFileGroupInfo(
type = _TYPE.OBJECT_FILE_GROUP,
object_files = _cc_internal.freeze([object_file]),
object_files = (object_file,),
is_whole_archive = False,
),
)
Expand Down Expand Up @@ -226,7 +225,7 @@ def _add_static_library_to_link(
libraries_to_link_values.append(
_ObjectFileGroupInfo(
type = _TYPE.OBJECT_FILE_GROUP,
object_files = _cc_internal.freeze([object]),
object_files = (object,),
is_whole_archive = True,
),
)
Expand All @@ -245,7 +244,7 @@ def _add_static_library_to_link(
libraries_to_link_values.append(
_ObjectFileGroupInfo(
type = _TYPE.OBJECT_FILE_GROUP,
object_files = _cc_internal.freeze(objects),
object_files = tuple(objects),
is_whole_archive = False,
),
)
Expand Down