Revert "[build] Wrap BuildConfig.h in HAVE_CONFIG_H. (#904)" (#918)

This reverts commit 6c75a3e.
project-chip · May 29, 2020 · 8396966 · 8396966
1 parent 220d668
commit 8396966
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/config/efr32/efr32-app.mk b/config/efr32/efr32-app.mk
@@ -263,7 +263,6 @@ endif
 endif
 
 STD_DEFINES = \
-    HAVE_CONFIG_H \
     __STARTUP_CLEAR_BSS \
     $(MCU)
 

diff --git a/config/nrf5/nrf5-app.mk b/config/nrf5/nrf5-app.mk
@@ -144,7 +144,7 @@ STD_LIBS = \
 
 STD_INC_DIRS =
 
-STD_DEFINES = HAVE_CONFIG_H
+STD_DEFINES =
 
 STD_COMPILE_PREREQUISITES = nrf5-sdk-check
 

diff --git a/config/standalone/standalone-app.mk b/config/standalone/standalone-app.mk
@@ -91,8 +91,6 @@ STD_LIBS = \
     -lm \
     -lpthread
 
-STD_DEFINES = HAVE_CONFIG_H
-
 DEFINE_FLAGS = $(addprefix -D,$(STD_DEFINES) $(DEFINES))
 
 INC_FLAGS = $(addprefix -I,$(INC_DIRS) $(STD_INC_DIRS))

diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
@@ -38,9 +38,7 @@
 #define SYSTEMCONFIG_H
 
 /* Platform include headers */
-#ifdef HAVE_CONFIG_H
 #include <BuildConfig.h>
-#endif
 
 /* Include a CHIP project-specific configuration file, if defined.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -263,7 +263,6 @@ endif @@
     endif
     STD_DEFINES = \
-        HAVE_CONFIG_H \
         __STARTUP_CLEAR_BSS \
         $(MCU)
@@ Expand Down @@