Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] Wrap BuildConfig.h in HAVE_CONFIG_H. #904

Merged
merged 2 commits into from
May 29, 2020
Merged

[build] Wrap BuildConfig.h in HAVE_CONFIG_H. #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f707e84
[build] Wrap BuildConfig.h in HAVE_CONFIG_H.
turon May 29, 2020
3deac14
[build] Add HAVE_CONFIG_H to STD_DEFINES for nrf, efr, and standalone.
turon May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/efr32/efr32-app.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ endif
endif

STD_DEFINES = \
HAVE_CONFIG_H \
__STARTUP_CLEAR_BSS \
$(MCU)

Expand Down
2 changes: 1 addition & 1 deletion config/nrf5/nrf5-app.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ STD_LIBS = \

STD_INC_DIRS =

STD_DEFINES =
STD_DEFINES = HAVE_CONFIG_H

STD_COMPILE_PREREQUISITES = nrf5-sdk-check

Expand Down
2 changes: 2 additions & 0 deletions config/standalone/standalone-app.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ 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))
Expand Down
2 changes: 2 additions & 0 deletions src/system/SystemConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
#define SYSTEMCONFIG_H

/* Platform include headers */
#ifdef HAVE_CONFIG_H
#include <BuildConfig.h>
#endif

/* Include a CHIP project-specific configuration file, if defined.
*
Expand Down