[Lldb-commits] [PATCH] D26510: Xcode build: specify NDEBUG for all binaries built using the BuildAndIntegration configuration

[Todd Fiala via lldb-commits]

tfiala created this revision.
tfiala added a reviewer: clayborg.
tfiala added a subscriber: lldb-commits.

BuildAndIntegration is the configuration used to build Apple-built LLDB.  This configuration currently requires NDEBUG to be specified.  This change adds a new Xcode variable, LLDB_NDEBUG_CFLAGS, which specifies "-DNDEBUG" when using the BuildAndIntegration configuration, and specifies nothing for all other configurations.  All binaries have been modified to include $(LLDB_NDEBUG_CFLAGS) in the full set of other cflags and other cxxflags.


https://reviews.llvm.org/D26510

Files:
  project.pbxproj


Index: project.pbxproj
===================================================================
--- project.pbxproj
+++ project.pbxproj
@@ -7957,6 +7957,7 @@
 				"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
 				LLDB_ENABLE_COVERAGE = 0;
 				LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
+				LLDB_NDEBUG_CFLAGS = "";
 				LLDB_TOOLS_INSTALL_DIR = /usr/bin;
 				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
 				LLDB_ZLIB_LDFLAGS = "-lz";
@@ -7973,6 +7974,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_COVERAGE_CFLAGS)",
 					"-Wimplicit-fallthrough",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(LLDB_COMPRESSION_LDFLAGS)",
@@ -8050,6 +8052,7 @@
 				"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
 				LLDB_ENABLE_COVERAGE = 0;
 				LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
+				LLDB_NDEBUG_CFLAGS = "";
 				LLDB_TOOLS_INSTALL_DIR = /usr/bin;
 				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
 				LLDB_ZLIB_LDFLAGS = "-lz";
@@ -8066,6 +8069,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_COVERAGE_CFLAGS)",
 					"-Wimplicit-fallthrough",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(LLDB_COMPRESSION_LDFLAGS)",
@@ -8375,6 +8379,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_GTESTS_CFLAGS)",
 					"-DGTEST_HAS_RTTI=0",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -8417,6 +8422,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_GTESTS_CFLAGS)",
 					"-DGTEST_HAS_RTTI=0",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -8459,6 +8465,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_GTESTS_CFLAGS)",
 					"-DGTEST_HAS_RTTI=0",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -8501,6 +8508,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_GTESTS_CFLAGS)",
 					"-DGTEST_HAS_RTTI=0",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -8963,6 +8971,7 @@
 				LLDB_ENABLE_COVERAGE = 0;
 				LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
 				"LLDB_FRAMEWORK_INSTALL_DIR[sdk=iphoneos*]" = /System/Library/PrivateFrameworks;
+				LLDB_NDEBUG_CFLAGS = "-DNDEBUG";
 				LLDB_TOOLS_INSTALL_DIR = /Applications/Xcode.app/Contents/Developer/usr/bin;
 				"LLDB_TOOLS_INSTALL_DIR[sdk=iphoneos*]" = /usr/local/bin;
 				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
@@ -8979,6 +8988,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_COVERAGE_CFLAGS)",
 					"-Wimplicit-fallthrough",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(LLDB_COMPRESSION_LDFLAGS)",
@@ -9680,6 +9690,7 @@
 				"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
 				LLDB_ENABLE_COVERAGE = 0;
 				LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
+				LLDB_NDEBUG_CFLAGS = "";
 				LLDB_TOOLS_INSTALL_DIR = /usr/bin;
 				LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
 				LLDB_ZLIB_LDFLAGS = "-lz";
@@ -9696,6 +9707,7 @@
 					"$(LLDB_COMPRESSION_CFLAGS)",
 					"$(LLDB_COVERAGE_CFLAGS)",
 					"-Wimplicit-fallthrough",
+					"$(LLDB_NDEBUG_CFLAGS)",
 				);
 				OTHER_LDFLAGS = (
 					"$(LLDB_COMPRESSION_LDFLAGS)",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26510.77499.patch
Type: text/x-patch
Size: 3255 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20161110/0ec0bb39/attachment.bin>