Skip to content

Commit 8a9097a

Browse files
committed
fixes
Signed-off-by: Aaron Sky <[email protected]>
1 parent 2aa65ac commit 8a9097a

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

xcodeproj/internal/templates/bazel_build.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,10 @@ readonly base_pre_config_flags=(
115115

116116

117117
if [[ "${BAZEL_SEPARATE_INDEXBUILD_OUTPUT_BASE:-}" == "YES" ]]; then
118-
# Create VFS overlay
119-
120-
cat > "$OBJROOT/bazel-out-overlay.yaml" <<EOF
121-
{"case-sensitive": "false", "fallthrough": true, "roots": [$vfs_overlay_roots],"version": 0}
122-
EOF
118+
# Create VFS overlay
119+
cat > "$OBJROOT/bazel-out-overlay.yaml" <<EOF
120+
{"case-sensitive": "false", "fallthrough": true, "roots": [$vfs_overlay_roots],"version": 0}
121+
EOF
123122
fi
124123

125124
# Custom Swift toolchains
@@ -184,13 +183,13 @@ if [[ -n "${target_ids:-}" ]]; then
184183
)
185184

186185
if [ -n "$diff_output" ]; then
187-
missing_target_ids=("${diff_output[@]}")
188-
echo "error: There were some target IDs that weren't known to Bazel" \
186+
missing_target_ids=("${diff_output[@]}")
187+
echo "error: There were some target IDs that weren't known to Bazel" \
189188
"(e.g. \"${missing_target_ids[0]}\"). Please regenerate the project to fix" \
190189
"this. If you are still getting this error after regenerating your project," \
191190
"please file a bug report here:" \
192191
"https://github.com/MobileNativeFoundation/rules_xcodeproj/issues/new?template=bug.md" \
193-
>&2
194-
exit 1
192+
>&2
193+
exit 1
195194
fi
196195
fi

xcodeproj/internal/templates/generator.BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ xcodeproj(
3131
runner_label = "%runner_label%",
3232
scheme_autogeneration_mode = "%scheme_autogeneration_mode%",
3333
scheme_autogeneration_config = %scheme_autogeneration_config%,
34+
separate_index_build_output_base = %separate_index_build_output_base%,
3435
tags = %tags%,
3536
target_name_mode = "%target_name_mode%",
3637
top_level_device_targets = %top_level_device_targets%,

xcodeproj/internal/xcodeproj_runner.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ def _write_generator_build_file(
219219
"%runner_label%": runner_label,
220220
"%scheme_autogeneration_config%": str(attr.scheme_autogeneration_config),
221221
"%scheme_autogeneration_mode%": attr.scheme_autogeneration_mode,
222+
"%separate_index_build_output_base%": str(attr._separate_index_build_output_base[BuildSettingInfo].value),
222223
"%tags%": tags,
223224
"%target_name_mode%": attr.target_name_mode,
224225
"%testonly%": str(attr.testonly),

0 commit comments

Comments
 (0)