Title: [157686] trunk/Tools
- Revision
- 157686
- Author
- [email protected]
- Date
- 2013-10-19 16:18:37 -0700 (Sat, 19 Oct 2013)
Log Message
Mac DumpRenderTree builds without NDEBUG even in release mode
https://bugs.webkit.org/show_bug.cgi?id=123066
Reviewed by Dan Bernstein.
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* DumpRenderTree/mac/Configurations/Base.xcconfig:
Use the same pattern as WebCore and WebKitTestRunner.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (157685 => 157686)
--- trunk/Tools/ChangeLog 2013-10-19 23:13:23 UTC (rev 157685)
+++ trunk/Tools/ChangeLog 2013-10-19 23:18:37 UTC (rev 157686)
@@ -1,3 +1,14 @@
+2013-10-19 Alexey Proskuryakov <[email protected]>
+
+ Mac DumpRenderTree builds without NDEBUG even in release mode
+ https://bugs.webkit.org/show_bug.cgi?id=123066
+
+ Reviewed by Dan Bernstein.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ Use the same pattern as WebCore and WebKitTestRunner.
+
2013-10-19 Zan Dobersek <[email protected]>
REGRESSION(r155373): Mac WK2 EWS bots is actually Mac WK1 debug
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (157685 => 157686)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-10-19 23:13:23 UTC (rev 157685)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-10-19 23:18:37 UTC (rev 157686)
@@ -1100,6 +1100,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BCB282F40CFA7450007E533E /* DebugRelease.xcconfig */;
buildSettings = {
+ DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)";
GCC_OPTIMIZATION_LEVEL = 0;
};
name = Debug;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (157685 => 157686)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2013-10-19 23:13:23 UTC (rev 157685)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2013-10-19 23:18:37 UTC (rev 157686)
@@ -25,7 +25,7 @@
CLANG_CXX_LIBRARY = libc++;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include ForwardingHeaders mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/_javascript_Core/icu;
-GCC_PREPROCESSOR_DEFINITIONS = ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
PREBINDING = NO
GCC_C_LANGUAGE_STANDARD = gnu99
@@ -40,6 +40,10 @@
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
LINKER_DISPLAYS_MANGLED_NAMES = YES;
+DEBUG_DEFINES_debug = ;
+DEBUG_DEFINES_normal = NDEBUG;
+DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
