Title: [253439] trunk/Source/WebKitLegacy/mac
- Revision
- 253439
- Author
- [email protected]
- Date
- 2019-12-12 10:45:50 -0800 (Thu, 12 Dec 2019)
Log Message
REGRESSION (r229930, r231063): WebKitLegacy.xcconfig overwrites OTHER_CFLAGS, OTHER_CPLUSPLUSFLAGS and OTHER_LDFLAGS from Base.xcconfig
<https://webkit.org/b/205144>
Reviewed by Alexey Proskuryakov.
* Configurations/WebKitLegacy.xcconfig:
(OTHER_CFLAGS): Add back $(inherited) to fix the bug.
(OTHER_CFLAGS_COCOA_TOUCH): Add variable to hold value.
(OTHER_CFLAGS_COCOA_TOUCH_YES): Remove unused $(inherited).
(OTHER_CFLAGS_COCOA_TOUCH_NO): Ditto.
(OTHER_CPLUSPLUSFLAGS): Add back $(inherited) to fix the
bug, and don't assume $(OTHER_CFLAGS) is identical to this.
(OTHER_LDFLAGS): Add back $(inherited) to fix the bug.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (253438 => 253439)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-12-12 18:35:39 UTC (rev 253438)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-12-12 18:45:50 UTC (rev 253439)
@@ -1,3 +1,19 @@
+2019-12-12 David Kilzer <[email protected]>
+
+ REGRESSION (r229930, r231063): WebKitLegacy.xcconfig overwrites OTHER_CFLAGS, OTHER_CPLUSPLUSFLAGS and OTHER_LDFLAGS from Base.xcconfig
+ <https://webkit.org/b/205144>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ (OTHER_CFLAGS): Add back $(inherited) to fix the bug.
+ (OTHER_CFLAGS_COCOA_TOUCH): Add variable to hold value.
+ (OTHER_CFLAGS_COCOA_TOUCH_YES): Remove unused $(inherited).
+ (OTHER_CFLAGS_COCOA_TOUCH_NO): Ditto.
+ (OTHER_CPLUSPLUSFLAGS): Add back $(inherited) to fix the
+ bug, and don't assume $(OTHER_CFLAGS) is identical to this.
+ (OTHER_LDFLAGS): Add back $(inherited) to fix the bug.
+
2019-12-09 Eric Carlson <[email protected]>
Rename media in the GPU process preference
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (253438 => 253439)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-12-12 18:35:39 UTC (rev 253438)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-12-12 18:45:50 UTC (rev 253439)
@@ -43,10 +43,11 @@
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
+OTHER_CFLAGS = $(inherited) $(OTHER_CFLAGS_COCOA_TOUCH);
+OTHER_CFLAGS_COCOA_TOUCH = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+OTHER_CFLAGS_COCOA_TOUCH_YES = -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
+OTHER_CFLAGS_COCOA_TOUCH_NO = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(OTHER_CFLAGS_COCOA_TOUCH);
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) BUILDING_WEBKIT U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKitLegacy $(inherited);
@@ -93,7 +94,7 @@
WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
WK_WEBINSPECTORUI_LDFLAGS_macosx = -weak_framework WebInspectorUI;
-OTHER_LDFLAGS = -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
