diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel @@ -2603,13 +2603,9 @@ "tools/llvm-exegesis/lib/*.h", ]), hdrs = glob(["tools/llvm-exegesis/lib/*.h"]), - copts = llvm_copts + ["-DHAVE_LIBPFM=1"], + copts = llvm_copts, features = ["-header_modules"], strip_include_prefix = "tools/llvm-exegesis/lib", - tags = [ - "manual", # External dependency (libpfm4) - "nobuildkite", # TODO(chandlerc): Add support for fetching and building libpfm4 and enable this. - ], deps = [ ":AllTargetsAsmParsers", ":AllTargetsCodeGens", @@ -3080,13 +3076,8 @@ srcs = [ "tools/llvm-exegesis/llvm-exegesis.cpp", ], - copts = llvm_copts + ["-DHAVE_LIBPFM=0"], - linkopts = ["-lpfm"], + copts = llvm_copts, stamp = 0, - tags = [ - "manual", # External dependency (libpfm4 through Exegesis) - "nobuildkite", # TODO(chandlerc): Enable when the library builds. - ], deps = [ ":AllTargetsAsmParsers", ":AllTargetsCodeGens", diff --git a/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel --- a/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel @@ -698,12 +698,6 @@ ) + [ "tools/llvm-exegesis/Common/AssemblerUtils.h", ], - copts = ["-DHAVE_LIBPFM=1"], - linkopts = ["-lpfm"], - tags = [ - "manual", # External dependency (libpfm4) - "nobuildkite", # TODO(chandlerc): Add support for fetching and building libpfm4 and enable this. - ], deps = [ "//llvm:AllTargetsCodeGens", "//llvm:AllTargetsDisassemblers",