This is an archive of the discontinued LLVM Phabricator instance.

Differential D120039

[Bazel] Fix build after ObjCopy move.
ClosedPublic

Authored by akuegel on Feb 17 2022, 4:02 AM.

Details

Reviewers
bkramer
alexander-shaposhnikov
Commits
rGe7d65fca7ec4: [Bazel] Fix build after ObjCopy move.

Diff Detail

Event Timeline

akuegel created this revision.Feb 17 2022, 4:02 AM
Herald added a reviewer: alexander-shaposhnikov. · View Herald TranscriptFeb 17 2022, 4:02 AM
Herald added a subscriber: abrachet. · View Herald Transcript
akuegel requested review of this revision.Feb 17 2022, 4:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 17 2022, 4:02 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B150191: Diff 409578.Feb 17 2022, 4:07 AM
akuegel updated this revision to Diff 409579.Feb 17 2022, 4:09 AM

Simplify

akuegel updated this revision to Diff 409581.Feb 17 2022, 4:12 AM

Simplify again

akuegel updated this revision to Diff 409584.Feb 17 2022, 4:14 AM

Forgot to remove llvm-objcopy-headers dependency.

Harbormaster completed remote builds in B150195: Diff 409584.Feb 17 2022, 4:20 AM
akuegel added a comment.Feb 17 2022, 4:21 AM

Bazel passed, I think I will land this now to make it green again. Happy to address any feedback in followup patches.

This revision was not accepted when it landed; it landed in state Needs Review.Feb 17 2022, 4:22 AM
Closed by commit rGe7d65fca7ec4: [Bazel] Fix build after ObjCopy move. (authored by akuegel). · Explain Why
This revision was automatically updated to reflect the committed changes.
akuegel added a commit: rGe7d65fca7ec4: [Bazel] Fix build after ObjCopy move..
GMNGeoffrey added a subscriber: GMNGeoffrey.Feb 17 2022, 8:48 AM

LGTM, thanks

Revision Contents

PathSize
utils/
bazel/
llvm-project-overlay/
llvm/
46 lines
unittests/
16 lines

Diff 409585

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

Show First 20 Lines • Show All 781 Lines • ▼ Show 20 Linescc_library(
copts = llvm_copts, copts = llvm_copts,
deps = [ deps = [
":BinaryFormat", ":BinaryFormat",
":Support", ":Support",
], ],
) )
cc_library( cc_library(
name = "ObjCopy",
srcs = glob([
"lib/ObjCopy/**/*.cpp",
"lib/ObjCopy/**/*.h",
]),
hdrs = glob([
"include/llvm/ObjCopy/**/*.h",
]),
copts = llvm_copts,
includes = ["lib/ObjCopy"],
deps = [
":MC",
":Object",
":ObjectYAML",
":Support",
":Target",
":intrinsics_impl_gen",
],
)
cc_library(
name = "Object", name = "Object",
srcs = glob([ srcs = glob([
"lib/Object/*.cpp", "lib/Object/*.cpp",
"lib/Object/*.h", "lib/Object/*.h",
]), ]),
hdrs = glob([ hdrs = glob([
"include/llvm/Object/*.h", "include/llvm/Object/*.h",
]) + [ ]) + [
▲ Show 20 Lines • Show All 1,629 Lines • ▼ Show 20 Lines tags = [
"nobuildkite", # TODO(gcmn): Fix remote execution and re-enable "nobuildkite", # TODO(gcmn): Fix remote execution and re-enable
], ],
deps = [ deps = [
":Support", ":Support",
":config", ":config",
], ],
) )
# FIXME: This library should use `textual_hdrs` instead of `hdrs` as we don't
# want to parse or build modules for them (and haven't duplicated the necessary
# dependencies), but unfortunately that doesn't work with
# `strip_include_prefix`: https://github.com/bazelbuild/bazel/issues/12424
#
# For now, we simply disable features that might rely on the headers parsing.
cc_library(
name = "llvm-objcopy-headers",
hdrs = glob(["tools/llvm-objcopy/**/*.h"]),
features = [
"-parse_headers",
"-header_modules",
],
strip_include_prefix = "tools/llvm-objcopy",
)
cc_library( cc_library(
name = "MCA", name = "MCA",
srcs = glob([ srcs = glob([
"lib/MCA/**/*.cpp", "lib/MCA/**/*.cpp",
"lib/MCA/**/*.h", "lib/MCA/**/*.h",
]), ]),
hdrs = glob([ hdrs = glob([
"include/llvm/MCA/**/*.h", "include/llvm/MCA/**/*.h",
▲ Show 20 Lines • Show All 873 Lines • ▼ Show 20 Lines deps = [
":Core", ":Core",
":Support", ":Support",
], ],
) )
cc_binary( cc_binary(
name = "llvm-objcopy", name = "llvm-objcopy",
srcs = glob([ srcs = glob([
"tools/llvm-objcopy/**/*.cpp", "tools/llvm-objcopy/*.cpp",
# Note that we redundantly include the headers here to allow files to "tools/llvm-objcopy/*.h",
# include same-directory headers in addition to including headers via
# the `llvm-objcopy-headers` rule's stripped include prefix.
"tools/llvm-objcopy/**/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
stamp = 0, stamp = 0,
deps = [ deps = [
":BinaryFormat", ":BinaryFormat",
":MC", ":MC",
":ObjCopy",
":Object", ":Object",
":ObjectYAML", ":ObjectYAML",
":Option", ":Option",
":Support", ":Support",
":Target", ":Target",
":llvm-bitcode-strip-opts", ":llvm-bitcode-strip-opts",
":llvm-installnametool-opts", ":llvm-installnametool-opts",
":llvm-objcopy-headers",
":llvm-objcopy-opts", ":llvm-objcopy-opts",
":llvm-strip-opts", ":llvm-strip-opts",
], ],
) )
binary_alias( binary_alias(
name = "llvm-strip", name = "llvm-strip",
binary = ":llvm-objcopy", binary = ":llvm-objcopy",
▲ Show 20 Lines • Show All 968 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel

Show First 20 Lines • Show All 406 Lines • ▼ Show 20 Lines deps = [
"//llvm:Support", "//llvm:Support",
"//llvm:Target", "//llvm:Target",
"//llvm:gtest", "//llvm:gtest",
"//llvm:gtest_main", "//llvm:gtest_main",
], ],
) )
cc_test( cc_test(
name = "objcopy_tests",
srcs = glob(
["ObjCopy/*.cpp"],
allow_empty = False,
),
deps = [
"//llvm:ObjCopy",
"//llvm:Object",
"//llvm:ObjectYAML",
"//llvm:TestingSupport",
"//llvm:gtest",
"//llvm:gtest_main",
],
)
cc_test(
name = "object_tests", name = "object_tests",
size = "small", size = "small",
srcs = glob( srcs = glob(
["Object/*.cpp"], ["Object/*.cpp"],
allow_empty = False, allow_empty = False,
), ),
deps = [ deps = [
"//llvm:Object", "//llvm:Object",
▲ Show 20 Lines • Show All 261 Lines • Show Last 20 Lines