Title: [164542] trunk/Source/WebKit/mac
- Revision
- 164542
- Author
- [email protected]
- Date
- 2014-02-22 09:31:15 -0800 (Sat, 22 Feb 2014)
Log Message
Revert r164434 since it actually broke ASan builds
<http://webkit.org/b/128871>
* Configurations/WebKit.xcconfig: This caused -asan-blacklist to
be included twice on every compiler command, which caused clang
to error out.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (164541 => 164542)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-22 16:06:41 UTC (rev 164541)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-22 17:31:15 UTC (rev 164542)
@@ -1,3 +1,12 @@
+2014-02-22 David Kilzer <[email protected]>
+
+ Revert r164434 since it actually broke ASan builds
+ <http://webkit.org/b/128871>
+
+ * Configurations/WebKit.xcconfig: This caused -asan-blacklist to
+ be included twice on every compiler command, which caused clang
+ to error out.
+
2014-02-21 Brent Fulgham <[email protected]>
Extend media support for WebVTT sources
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (164541 => 164542)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-02-22 16:06:41 UTC (rev 164541)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-02-22 17:31:15 UTC (rev 164542)
@@ -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 = $(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));
+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);
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
