From f828671e3b202ed317ad432dd6d5bfa71e52ad46 Mon Sep 17 00:00:00 2001 From: Michael Allwright Date: Fri, 30 May 2025 08:35:46 +0000 Subject: [PATCH 1/2] Fix target name for meson_with_requirements meson_with_requirements has a small quirk where the resulting rule name ends up with an '_' postfixed to the end. This is unexpected and a bit annoying when the meson project is a dependency of another rule since you have to remember to add the _ in any include paths etc. --- foreign_cc/private/transitions.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/foreign_cc/private/transitions.bzl b/foreign_cc/private/transitions.bzl index 745692757..66933aa07 100644 --- a/foreign_cc/private/transitions.bzl +++ b/foreign_cc/private/transitions.bzl @@ -52,22 +52,22 @@ def foreign_cc_rule_variant(name, rule, toolchain, **kwargs): **kwargs: Remaining keyword arguments """ - foreign_cc_rule_target_name = name + "_" + extra_toolchains_target_name = name + "_" tags = kwargs.pop("tags", []) visibility = kwargs.pop("visibility", []) rule( - name = foreign_cc_rule_target_name, + name = name, tags = tags + ["manual"], visibility = visibility, **kwargs ) extra_toolchains_transitioned_foreign_cc_target( - name = name, + name = extra_toolchains_target_name, extra_toolchain = toolchain, - target = foreign_cc_rule_target_name, + target = name, tags = tags, visibility = visibility, ) From 9d8a85deee2845c77874d40a42c262fa5722ee2b Mon Sep 17 00:00:00 2001 From: Michael Allwright Date: Fri, 30 May 2025 08:50:53 +0000 Subject: [PATCH 2/2] Revert "Fix target name for meson_with_requirements" This reverts commit f828671e3b202ed317ad432dd6d5bfa71e52ad46. --- foreign_cc/private/transitions.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/foreign_cc/private/transitions.bzl b/foreign_cc/private/transitions.bzl index 66933aa07..745692757 100644 --- a/foreign_cc/private/transitions.bzl +++ b/foreign_cc/private/transitions.bzl @@ -52,22 +52,22 @@ def foreign_cc_rule_variant(name, rule, toolchain, **kwargs): **kwargs: Remaining keyword arguments """ - extra_toolchains_target_name = name + "_" + foreign_cc_rule_target_name = name + "_" tags = kwargs.pop("tags", []) visibility = kwargs.pop("visibility", []) rule( - name = name, + name = foreign_cc_rule_target_name, tags = tags + ["manual"], visibility = visibility, **kwargs ) extra_toolchains_transitioned_foreign_cc_target( - name = extra_toolchains_target_name, + name = name, extra_toolchain = toolchain, - target = name, + target = foreign_cc_rule_target_name, tags = tags, visibility = visibility, )