commit 90090c6f177ac899d88d78a4d43ed9315ed8681d
author Michael Sandstedt <michael.sandstedt@gmail.com> Wed Oct 14 09:22:33 2020 -0500
committer GitHub <noreply@github.com> Wed Oct 14 10:22:33 2020 -0400
tree 24470b00c67565c836469373d2153b6e0b4c12df
parent 4780fd371875069bf356c2d856e90bbace15b2b9

[build] fix Linux and Darwin builds when chip_enable_ble=false (#3179) (#3238)

src/BUILD.gn

diff --git a/src/BUILD.gn b/src/BUILD.gn
index 1aab88a..5883684 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -27,8 +27,8 @@
 
   defines = [ "CHIP_SEPARATE_CONFIG_H=1" ]
 
-  if (current_os == "linux") {
-    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1" ]
+  if (chip_device_platform == "linux" || chip_device_platform == "darwin") {
+    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=${chip_enable_ble}" ]
   }
 }
 

src/platform/Darwin/CHIPDevicePlatformConfig.h

diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h
index ee2f929..142bc09 100644
--- a/src/platform/Darwin/CHIPDevicePlatformConfig.h
+++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h
@@ -30,7 +30,9 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+#endif
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0