Skip to content

Commit

Permalink
Merge pull request #335 from bzbarsky-apple/default-no-darwin-tool-in…
Browse files Browse the repository at this point in the history
…-gn-build

Don't break gn_build.sh.
  • Loading branch information
woody-apple authored Jul 1, 2022
2 parents a65ea02 + 95d1c4b commit 1086fc3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 1086fc3

Please sign in to comment.