Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 0 additions & 22 deletions features/custom/qnx/make_cc_features.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,6 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

def compute_feature_lists(target_os):
"""Returns the flat known/enabled feature label lists for target_os.

Unlike cc_feature_set (which groups features for requires_any_of/requires_all_of
constraints and does not itself provide FeatureInfo), cc_toolchain_config's
known_features/enabled_features attrs require every entry to individually
provide FeatureInfo — so this returns plain lists of cc_feature labels rather
than a single grouping target.

Per-instance features (extra_compile_flags, extra_c_compile_flags,
extra_cxx_compile_flags, extra_link_flags, sysroot_link_flags,
compiler_library_search_paths) are baked into _LINUX_FEATURES/_QNX_FEATURES
directly since their target names never change across toolchain instances —
see templates/BUILD.template for where those targets get created.

Args:
target_os: "linux" or "qnx".

Returns:
(known_features, enabled_features) tuple of flat label lists.
"""

_QNX_FEATURES = [
("@score_bazel_cpp_toolchains//features/native/markers:dbg", False), # Bazel auto-toggles via -c dbg
("@score_bazel_cpp_toolchains//features/native/markers:no_legacy_features", True),
Expand Down
40 changes: 0 additions & 40 deletions features/make_cc_features.bzl

This file was deleted.

2 changes: 1 addition & 1 deletion templates/BUILD.template
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ make_sysroot_link_flags(
)
%{tc_custom_features}
# known_features must list every feature (enabled or opt-in); enabled_features is
# the order-irrelevant subset that should start on. See compute_feature_lists().
# the order-irrelevant subset that should start on. See get_feature_lists().
_KNOWN_FEATURES, _ENABLED_FEATURES = get_feature_lists()

filegroup(
Expand Down
Loading