diff options
| author | Liz Kammer <eakammer@google.com> | 2022-04-21 12:38:58 +0000 |
|---|---|---|
| committer | Lukács T. Berki <lberki@google.com> | 2022-04-21 12:56:11 +0000 |
| commit | 136cbfba201db366e3f0340350ab8c96a38609f2 (patch) | |
| tree | 399e2a671fa832a6b4b8bb710db3f30529bac02a | |
| parent | 350c3ae907d0dbae418ef74708b2b80eadea670e (diff) | |
| download | bazel-136cbfba201db366e3f0340350ab8c96a38609f2.tar.gz | |
Revert "Re-implement version_script in cc_library_shared."
This reverts commit 350c3ae907d0dbae418ef74708b2b80eadea670e.
Reason for revert: No longer need a version_script attribute
Handling version_script via user_link_flags and
additional_linker_inputs.
Change-Id: I9a84df9dffd5e847d9823b64a7930f73812f02f1
Bug: 225054132
| -rw-r--r-- | rules_cc/examples/experimental_cc_shared_library.bzl | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/rules_cc/examples/experimental_cc_shared_library.bzl b/rules_cc/examples/experimental_cc_shared_library.bzl index 355ed0ec..905bd270 100644 --- a/rules_cc/examples/experimental_cc_shared_library.bzl +++ b/rules_cc/examples/experimental_cc_shared_library.bzl @@ -309,14 +309,6 @@ def _get_permissions(ctx): return ctx.attr.permissions return None -def _process_version_script(ctx): - if ctx.attr.version_script == None: - return ([], []) - - version_script = ctx.files.version_script[0] - version_script_arg = "-Wl,--version-script," + version_script.path - return ([version_script], [version_script_arg]) - def _cc_shared_library_impl(ctx): cc_common.check_experimental_cc_shared_library() cc_toolchain = find_cc_toolchain(ctx) @@ -359,10 +351,7 @@ def _cc_shared_library_impl(ctx): linking_context = _create_linker_context(ctx, linker_inputs) - # Divergence from rules_cc: that version does not support version scripts - version_script, version_script_arg = _process_version_script(ctx) - - user_link_flags = version_script_arg[:] + user_link_flags = [] for user_link_flag in ctx.attr.user_link_flags: user_link_flags.append(ctx.expand_location(user_link_flag, targets = ctx.attr.additional_linker_inputs)) @@ -372,7 +361,7 @@ def _cc_shared_library_impl(ctx): cc_toolchain = cc_toolchain, linking_contexts = [linking_context], user_link_flags = user_link_flags, - additional_inputs = ctx.files.additional_linker_inputs + version_script, + additional_inputs = ctx.files.additional_linker_inputs, name = ctx.label.name, output_type = "dynamic_library", ) @@ -474,7 +463,6 @@ cc_shared_library = rule( "preloaded_deps": attr.label_list(providers = [CcInfo]), "roots": attr.label_list(providers = [CcInfo], aspects = [graph_structure_aspect]), "static_deps": attr.string_list(), - "version_script": attr.label(allow_single_file = True), "user_link_flags": attr.string_list(), "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), "_enable_permissions_check": attr.label(default = "//examples:enable_permissions_check"), |