From f25d3a2a8ab54d53736811bebf32ce7dd2bbdfb0 Mon Sep 17 00:00:00 2001 From: Nikola Radakovic Date: Thu, 20 Aug 2026 11:45:29 +0200 Subject: [PATCH] Bug fix for output exec path The template was missing expand_if_available which by default sets output execution path. The variable can be set over different toolchain so we always need to check if the variable is set regardless if our actions need it or not. --- templates/linux/cc_toolchain_config.bzl.template | 5 ++++- templates/qnx/cc_toolchain_config.bzl.template | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/linux/cc_toolchain_config.bzl.template b/templates/linux/cc_toolchain_config.bzl.template index f85312f..3a8fbdb 100644 --- a/templates/linux/cc_toolchain_config.bzl.template +++ b/templates/linux/cc_toolchain_config.bzl.template @@ -613,7 +613,10 @@ def _impl(ctx): flag_set( actions = [ACTION_NAMES.cpp_link_static_library], flag_groups = [ - flag_group(flags = ["rcsD", "%{output_execpath}"]), + flag_group( + flags = ["rcsD", "%{output_execpath}"], + expand_if_available = "output_execpath", + ), flag_group( iterate_over = "libraries_to_link", flag_groups = [ diff --git a/templates/qnx/cc_toolchain_config.bzl.template b/templates/qnx/cc_toolchain_config.bzl.template index 39bb81a..861378b 100644 --- a/templates/qnx/cc_toolchain_config.bzl.template +++ b/templates/qnx/cc_toolchain_config.bzl.template @@ -304,7 +304,10 @@ def _impl(ctx): flag_set( actions = [ACTION_NAMES.cpp_link_static_library], flag_groups = [ - flag_group(flags = ["rcsD", "%{output_execpath}"]), + flag_group( + flags = ["rcsD", "%{output_execpath}"], + expand_if_available = "output_execpath", + ), flag_group( iterate_over = "libraries_to_link", flag_groups = [