diff --git a/xcodeproj/internal/execution_root.bzl b/xcodeproj/internal/execution_root.bzl
index bb7851325..1860d6295 100644
--- a/xcodeproj/internal/execution_root.bzl
+++ b/xcodeproj/internal/execution_root.bzl
@@ -15,6 +15,7 @@ def write_execution_root_file(*, actions, bin_dir_path, name):
     output = actions.declare_file("{}_execution_root_file".format(name))
 
     actions.run_shell(
+        use_default_shell_env = True,
         outputs = [output],
         command = """\
 bin_dir_full="$(perl -MCwd -e 'print Cwd::abs_path shift' "{bin_dir}";)"
diff --git a/xcodeproj/internal/templates/bazel_build.sh b/xcodeproj/internal/templates/bazel_build.sh
index 4fcc467a2..b05551cbb 100755
--- a/xcodeproj/internal/templates/bazel_build.sh
+++ b/xcodeproj/internal/templates/bazel_build.sh
@@ -19,7 +19,7 @@
 # - output_groups
 # - (optional) target_ids
 
-output_groups_flag="--output_groups=$(IFS=, ; echo "${output_groups[*]}")"
+output_groups_flag="--output_groups='$(IFS=, ; echo "${output_groups[*]}")'"
 readonly output_groups_flag
 
 # Set `output_base`