From 802274cc6a73a7027852b9b7d719b4413a8acec9 Mon Sep 17 00:00:00 2001 From: scentini Date: Wed, 14 Aug 2024 11:17:22 +0200 Subject: [PATCH] Use `target_flag_value` instead of `target_triple.str` (#2793) When users define a toolchain using a `.json` file the `toolchain.target_triple` is not populated, so `target_triple.str` is invalid. We use `target_flag_value` instead, which is equivalent to the `target_json.path` in cases where it's available and to `target_triple.str` otherwise. --- rust/private/rust_analyzer.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/private/rust_analyzer.bzl b/rust/private/rust_analyzer.bzl index dfccf5a051..813f2a2d73 100644 --- a/rust/private/rust_analyzer.bzl +++ b/rust/private/rust_analyzer.bzl @@ -263,7 +263,7 @@ def _create_single_crate(ctx, attrs, info): crate["deps"] = [_crate_id(dep.crate) for dep in info.deps if _crate_id(dep.crate) != crate_id] crate["aliases"] = {_crate_id(alias_target.crate): alias_name for alias_target, alias_name in info.aliases.items()} crate["cfg"] = info.cfgs - crate["target"] = find_toolchain(ctx).target_triple.str + crate["target"] = find_toolchain(ctx).target_flag_value if info.proc_macro_dylib_path != None: crate["proc_macro_dylib_path"] = _EXEC_ROOT_TEMPLATE + info.proc_macro_dylib_path return crate