Title: [230614] tags/Safari-606.1.13/Source/WebKit
- Revision
- 230614
- Author
- kocsen_ch...@apple.com
- Date
- 2018-04-12 17:02:46 -0700 (Thu, 12 Apr 2018)
Log Message
Cherry-pick r230606. rdar://problem/39386359
Use -iframework to ensure that frameworks from user paths and system paths are
ordered appropriately
https://bugs.webkit.org/show_bug.cgi?id=184557
-and corresponding-
rdar://problem/39386359
Reviewed by Dean Jackson.
* Configurations/WebKit.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-606.1.13/Source/WebKit/ChangeLog (230613 => 230614)
--- tags/Safari-606.1.13/Source/WebKit/ChangeLog 2018-04-12 23:55:02 UTC (rev 230613)
+++ tags/Safari-606.1.13/Source/WebKit/ChangeLog 2018-04-13 00:02:46 UTC (rev 230614)
@@ -1,5 +1,35 @@
2018-04-12 Kocsen Chung <kocsen_ch...@apple.com>
+ Cherry-pick r230606. rdar://problem/39386359
+
+ Use -iframework to ensure that frameworks from user paths and system paths are
+ ordered appropriately
+ https://bugs.webkit.org/show_bug.cgi?id=184557
+ -and corresponding-
+ rdar://problem/39386359
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/WebKit.xcconfig:
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-12 Beth Dakin <bda...@apple.com>
+
+ Use -iframework to ensure that frameworks from user paths and system paths are
+ ordered appropriately
+ https://bugs.webkit.org/show_bug.cgi?id=184557
+ -and corresponding-
+ rdar://problem/39386359
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/WebKit.xcconfig:
+
+2018-04-12 Kocsen Chung <kocsen_ch...@apple.com>
+
Revert r230359. rdar://problem/39396724
2018-04-12 Kocsen Chung <kocsen_ch...@apple.com>
Modified: tags/Safari-606.1.13/Source/WebKit/Configurations/WebKit.xcconfig (230613 => 230614)
--- tags/Safari-606.1.13/Source/WebKit/Configurations/WebKit.xcconfig 2018-04-12 23:55:02 UTC (rev 230613)
+++ tags/Safari-606.1.13/Source/WebKit/Configurations/WebKit.xcconfig 2018-04-13 00:02:46 UTC (rev 230614)
@@ -117,7 +117,7 @@
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) -F"$(SDK_DIR)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks" $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) -iframework"$(SDK_DIR)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks" $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS);
REEXPORTED_FRAMEWORK_NAMES = WebKitLegacy;
REEXPORTED_FRAMEWORK_NAMES[sdk=macosx*] = $(inherited) WebCore;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
