Title: [207990] trunk/Source/WebKit/mac
- Revision
- 207990
- Author
- [email protected]
- Date
- 2016-10-27 07:10:34 -0700 (Thu, 27 Oct 2016)
Log Message
Reapplied the configuration changes from r207934 without breaking iOS builds.
* Configurations/Base.xcconfig:
* Configurations/WebKitLegacy.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (207989 => 207990)
--- trunk/Source/WebKit/mac/ChangeLog 2016-10-27 12:20:52 UTC (rev 207989)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-27 14:10:34 UTC (rev 207990)
@@ -1,5 +1,12 @@
2016-10-27 Dan Bernstein <[email protected]>
+ Reapplied the configuration changes from r207934 without breaking iOS builds.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+2016-10-27 Dan Bernstein <[email protected]>
+
Reverted the configuration changes from r207934 because they broke iOS builds not using the Apple-internal SDK.
* Configurations/Base.xcconfig:
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (207989 => 207990)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-10-27 12:20:52 UTC (rev 207989)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-10-27 14:10:34 UTC (rev 207990)
@@ -69,6 +69,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (207989 => 207990)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-10-27 12:20:52 UTC (rev 207989)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-10-27 14:10:34 UTC (rev 207990)
@@ -51,7 +51,8 @@
FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)" $(inherited);
-OTHER_CFLAGS[sdk=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_CFLAGS = $(inherited) -isystem "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu";
+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -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;
@@ -58,7 +59,7 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
