Title: [164434] trunk/Source/WebKit/mac
- Revision
- 164434
- Author
- [email protected]
- Date
- 2014-02-20 10:15:42 -0800 (Thu, 20 Feb 2014)
Log Message
[ASan] WebKit1 sources are not compiled using ASAN macros
<http://webkit.org/b/128871>
Reviewed by Brent Fulgham.
* Configurations/WebKit.xcconfig: Use $inherited for
OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS so that ASAN_OTHER_CFLAGS
and ASAN_OTHER_CPLUSPLUSFLAGS are inherited from
DebugRelease.xcconfig.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (164433 => 164434)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-20 17:38:15 UTC (rev 164433)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-20 18:15:42 UTC (rev 164434)
@@ -1,3 +1,15 @@
+2014-02-20 David Kilzer <[email protected]>
+
+ [ASan] WebKit1 sources are not compiled using ASAN macros
+ <http://webkit.org/b/128871>
+
+ Reviewed by Brent Fulgham.
+
+ * Configurations/WebKit.xcconfig: Use $inherited for
+ OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS so that ASAN_OTHER_CFLAGS
+ and ASAN_OTHER_CPLUSPLUSFLAGS are inherited from
+ DebugRelease.xcconfig.
+
2014-02-19 Brady Eidson <[email protected]>
Add FeatureDefines for image controls
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (164433 => 164434)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-02-20 17:38:15 UTC (rev 164433)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-02-20 18:15:42 UTC (rev 164434)
@@ -53,9 +53,9 @@
STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
-OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
+OTHER_CFLAGS = $(inherited) $(OTHER_CFLAGS_$(PLATFORM_NAME));
+OTHER_CFLAGS_macosx = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(OTHER_CFLAGS_$(PLATFORM_NAME));
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
