Skip to content

Commit 2f18488

Browse files
committed
Make C++ tools configurable
The move to `cxx_internal_tools` broke open source users that had a custom `make_comp_db` to work around #307. This commit makes it configurable so that OSS users can again provide their own script to generate legal `compile_commands.json` files. A few remaining tools are made `PUBLIC` so that OSS users can simply reuse them.
1 parent 7bcbeaa commit 2f18488

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

prelude/cxx/tools/BUCK.v2

+3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ prelude.command_alias(
2424
],
2525
exe = ":hmap_wrapper.py",
2626
labels = ["buck2-only"],
27+
visibility = ["PUBLIC"],
2728
)
2829

2930
prelude.python_bootstrap_binary(
3031
name = "make_comp_db",
3132
main = "make_comp_db.py",
33+
visibility = ["PUBLIC"],
3234
)
3335

3436
prelude.python_bootstrap_binary(
@@ -59,6 +61,7 @@ prelude.python_bootstrap_binary(
5961
prelude.python_bootstrap_binary(
6062
name = "remap_cwd",
6163
main = "remap_cwd.py",
64+
visibility = ["PUBLIC"],
6265
)
6366

6467
prelude.python_bootstrap_binary(

prelude/cxx/tools/defs.bzl

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ def _cxx_internal_tools_impl(ctx: AnalysisContext) -> list[Provider]:
2424
cxx_internal_tools = rule(
2525
impl = _cxx_internal_tools_impl,
2626
attrs = {
27-
"concatenate_diagnostics": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:concatenate_diagnostics")),
28-
"dep_file_processor": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:dep_file_processor")),
29-
"dist_lto": attrs.default_only(attrs.dep(providers = [DistLtoToolsInfo], default = "prelude//cxx/dist_lto/tools:dist_lto_tools")),
30-
"hmap_wrapper": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:hmap_wrapper")),
31-
"make_comp_db": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:make_comp_db")),
32-
"remap_cwd": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:remap_cwd")),
33-
"stderr_to_file": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:stderr_to_file")),
27+
"concatenate_diagnostics": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:concatenate_diagnostics"),
28+
"dep_file_processor": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:dep_file_processor"),
29+
"dist_lto": attrs.dep(providers = [DistLtoToolsInfo], default = "prelude//cxx/dist_lto/tools:dist_lto_tools"),
30+
"hmap_wrapper": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:hmap_wrapper"),
31+
"make_comp_db": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:make_comp_db"),
32+
"remap_cwd": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:remap_cwd"),
33+
"stderr_to_file": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:stderr_to_file"),
3434
},
3535
)
3636

0 commit comments

Comments
 (0)