Fix ASAN options for clang build

project-chip · Feb 27, 2024 · e288d4b · e288d4b
1 parent 68c83f4
commit e288d4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -343,7 +343,7 @@ config("cosmetic_default") {
 }
 
 config("runtime_default") {
-  if (is_clang) {
+  if (is_clang) {  # Using Pigweed clang instead of Darwin host clang
     configs = [
       "$dir_pw_toolchain/host_clang:no_system_libcpp",
       "$dir_pw_toolchain/host_clang:xcode_sysroot",
@@ -402,7 +402,7 @@ config("sanitize_address") {
   ]
   ldflags = cflags
 
-  if (target_os == "mac" || target_os == "ios") {
+  if ((target_os == "mac" || target_os == "ios") && !is_clang) {
     defines += [ "_LIBCPP_HAS_NO_ASAN" ]
   }
 }

diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn
@@ -139,6 +139,7 @@ action("build-darwin-framework") {
 config("config") {
   include_dirs = [
     ".",
+    "include",
     "${chip_root}/examples/common",
     "${chip_root}/examples/darwin-framework-tool/commands/common",
     "${chip_root}/zzz_generated/darwin-framework-tool",