fix Xcode builds (project-chip#920)

Rob Walker · web-flow · commit 3321952e2014 · 2020-05-29T15:40:30.000-07:00
* fix macOS build * Revert "Revert "[build] Wrap BuildConfig.h in HAVE_CONFIG_H. (project-chip#904)" (project-chip#918)" This reverts commit 8396966.
diff --git a/config/efr32/efr32-app.mk b/config/efr32/efr32-app.mk
@@ -263,6 +263,7 @@ 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 =
+STD_DEFINES = HAVE_CONFIG_H
 
 STD_COMPILE_PREREQUISITES = nrf5-sdk-check
 
diff --git a/config/standalone/standalone-app.mk b/config/standalone/standalone-app.mk
@@ -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))
diff --git a/src/darwin/CHIPTool/CHIPTool.xcodeproj/project.pbxproj b/src/darwin/CHIPTool/CHIPTool.xcodeproj/project.pbxproj
@@ -324,6 +324,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_CONFIG_H,
 					"DEBUG=1",
 					"$(inherited)",
 				);
@@ -379,6 +380,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -273,8 +273,6 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(CHIP_PREFIX)/lib/libCHIP.a",
-				"$(CHIP_PREFIX)/lib/libSetupPayload.a",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -358,6 +356,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_CONFIG_H,
 					"DEBUG=1",
 					"$(inherited)",
 				);
@@ -415,6 +414,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -565,6 +565,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_CONFIG_H,
 					"DEBUG=1",
 					"$(inherited)",
 				);
@@ -670,6 +671,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
diff --git a/src/darwin/Framework/chip_xcode_build_connector.sh b/src/darwin/Framework/chip_xcode_build_connector.sh
@@ -58,7 +58,9 @@ configure_OPTIONS+=(
     configure_OPTIONS+=(--with-chip-project-includes="$CHIP_ROOT"/config/ios)
 }
 
-[[ ${PLATFORM_FAMILY_NAME} == macOS ]] && configure_OPTIONS+=(--with-chip-project-includes=no)
+[[ ${PLATFORM_FAMILY_NAME} == macOS ]] && {
+    configure_OPTIONS+=(--with-chip-project-includes="$CHIP_ROOT"/config/standalone)
+}
 
 configure_OPTIONS+=(
     --prefix="$CHIP_PREFIX"
diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
@@ -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.
  *

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@ configure_OPTIONS+=(`
`58`	`58`	`configure_OPTIONS+=(--with-chip-project-includes="$CHIP_ROOT"/config/ios)`
`59`	`59`	`}`
`60`	`60`
`61`		`-[[ ${PLATFORM_FAMILY_NAME} == macOS ]] && configure_OPTIONS+=(--with-chip-project-includes=no)`
	`61`	`+[[ ${PLATFORM_FAMILY_NAME} == macOS ]] && {`
	`62`	`+ configure_OPTIONS+=(--with-chip-project-includes="$CHIP_ROOT"/config/standalone)`
	`63`	`+}`
`62`	`64`
`63`	`65`	`configure_OPTIONS+=(`
`64`	`66`	`--prefix="$CHIP_PREFIX"`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@`
`38`	`38`	`#define SYSTEMCONFIG_H`
`39`	`39`
`40`	`40`	`/* Platform include headers */`
	`41`	`+#ifdef HAVE_CONFIG_H`
`41`	`42`	`#include <BuildConfig.h>`
	`43`	`+#endif`
`42`	`44`
`43`	`45`	`/* Include a CHIP project-specific configuration file, if defined.`
`44`	`46`	`*`