Title: [213481] trunk/Source/WebKit2
Revision
213481
Author
[email protected]
Date
2017-03-06 17:39:30 -0800 (Mon, 06 Mar 2017)

Log Message

Replace -sub_umbrella linker flag with a build setting
https://bugs.webkit.org/show_bug.cgi?id=169146

Reviewed by Tim Horton.

* Configurations/WebKit.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (213480 => 213481)


--- trunk/Source/WebKit2/ChangeLog	2017-03-07 01:29:19 UTC (rev 213480)
+++ trunk/Source/WebKit2/ChangeLog	2017-03-07 01:39:30 UTC (rev 213481)
@@ -1,3 +1,12 @@
+2017-03-06  Alexey Proskuryakov  <[email protected]>
+
+        Replace -sub_umbrella linker flag with a build setting
+        https://bugs.webkit.org/show_bug.cgi?id=169146
+
+        Reviewed by Tim Horton.
+
+        * Configurations/WebKit.xcconfig:
+
 2017-03-03  Matt Rajca  <[email protected]>
 
         Media: notify clients when the user never plays a media element that was prevented from auto-playing

Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (213480 => 213481)


--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2017-03-07 01:29:19 UTC (rev 213480)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2017-03-07 01:39:30 UTC (rev 213481)
@@ -55,11 +55,14 @@
 LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -sub_umbrella WebCore $(LIBWEBRTC_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(LIBWEBRTC_LDFLAGS);
 OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = -lAccessibility $(LIBWEBRTC_LDFLAGS);
 OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = -lAccessibility $(LIBWEBRTC_LDFLAGS);
 
+REEXPORTED_FRAMEWORK_NAMES = WebKitLegacy;
+REEXPORTED_FRAMEWORK_NAMES[sdk=macosx*] = $(inherited) WebCore;
+
 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to