From 6eee209f4976765729f516323e4a7209d476133e Mon Sep 17 00:00:00 2001 From: Guillaume Hugues Date: Tue, 7 Oct 2025 18:44:49 +0200 Subject: [PATCH 1/3] remove private prefix in execution root path Signed-off-by: Guillaume Hugues --- xcodeproj/internal/execution_root.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xcodeproj/internal/execution_root.bzl b/xcodeproj/internal/execution_root.bzl index bb78513251..d20694d269 100644 --- a/xcodeproj/internal/execution_root.bzl +++ b/xcodeproj/internal/execution_root.bzl @@ -19,6 +19,9 @@ def write_execution_root_file(*, actions, bin_dir_path, name): command = """\ bin_dir_full="$(perl -MCwd -e 'print Cwd::abs_path shift' "{bin_dir}";)" execution_root="${{bin_dir_full%/{bin_dir}}}" +if [[ $execution_root == /private/* ]]; then + execution_root="${{execution_root#/private}}" +fi echo "$execution_root" > "{output}" """.format( From 97bfc26b0c25af8729f87cd4eb7edb1ed811cf79 Mon Sep 17 00:00:00 2001 From: Guillaume Hugues Date: Tue, 7 Oct 2025 19:52:51 +0200 Subject: [PATCH 2/3] add doc for new behavior Signed-off-by: Guillaume Hugues --- xcodeproj/internal/execution_root.bzl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xcodeproj/internal/execution_root.bzl b/xcodeproj/internal/execution_root.bzl index d20694d269..a29824032c 100644 --- a/xcodeproj/internal/execution_root.bzl +++ b/xcodeproj/internal/execution_root.bzl @@ -4,6 +4,10 @@ def write_execution_root_file(*, actions, bin_dir_path, name): """Creates a `File` containing the absolute path to the Bazel execution \ root. + If the execution root is under `/private/`, this prefix is stripped so that + we don't end up with a different path than what Xcode uses (since we also + remove this prefix for Xcode). + Args: actions: `ctx.actions`. bin_dir_path: `ctx.bin_dir.path`. From 4cfa1c86226bdaaf0982f22f7a6adfcc16769d31 Mon Sep 17 00:00:00 2001 From: Guillaume Hugues Date: Tue, 7 Oct 2025 20:00:57 +0200 Subject: [PATCH 3/3] add changelog entry Signed-off-by: Guillaume Hugues --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e36d2d541..2dfdffe910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +56,7 @@ END_UNRELEASED_TEMPLATE ### Fixed -* TBD +* Fixed incompatible output base causing startup options change: [#3229](https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3229) ### Ruleset Development Changes