From b7c956fa408496897af5b3e6d7cd9dddb391130c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Fri, 1 Jul 2022 10:55:53 -0700
Subject: [PATCH] Don't break gn_build.sh.

---
 .github/workflows/build.yaml | 2 +-
 BUILD.gn                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9f44e16748206e..6fffb7fb6196a0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -389,7 +389,7 @@ jobs:
                           #   use that on Darwin.
                           # * the "host clang" build, which uses the pigweed
                           #   clang.
-                          "default") GN_ARGS='target_os="all" enable_standalone_chip_tool_darwin_build=false is_asan=true enable_host_clang_build=false enable_host_gcc_mbedtls_build=false';;
+                          "default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false enable_host_gcc_mbedtls_build=false';;
                           "python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
                       esac
                       BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
diff --git a/BUILD.gn b/BUILD.gn
index 7e3cc729bb96ea..f02d6fb3e6888f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -226,9 +226,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     enable_standalone_chip_tool_build =
         enable_default_builds && host_os != "win"
 
-    # Build the darwin-framework-tool example.
-    enable_standalone_chip_tool_darwin_build =
-        enable_default_builds && host_os == "mac"
+    # Build the darwin-framework-tool example.  By default this is off, because
+    # it requires a preceding XCode build of the framework.
+    enable_standalone_chip_tool_darwin_build = false
 
     # Build the shell example.
     enable_standalone_shell_build = enable_default_builds && host_os != "win"