Replace -sub_umbrella linker flag with a build setting
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Mar 2017 01:39:30 +0000 (01:39 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Mar 2017 01:39:30 +0000 (01:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=169146

Reviewed by Tim Horton.

* Configurations/WebKit.xcconfig:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@213481 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/WebKit.xcconfig

index 9b86313..0936445 100644 (file)
@@ -1,3 +1,12 @@
+2017-03-06  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <mrajca@apple.com>
 
         Media: notify clients when the user never plays a media element that was prevented from auto-playing
index 0910b23..f0a2efa 100644 (file)
@@ -55,11 +55,14 @@ LIBWEBRTC_LIBRARY_DIR[sdk=macosx*] = $(LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEW
 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;