Title: [293964] branches/safari-7614.1.12-branch/Source/WebKit
- Revision
- 293964
- Author
- repst...@apple.com
- Date
- 2022-05-08 21:04:59 -0700 (Sun, 08 May 2022)
Log Message
Cherry-pick r293936. rdar://problem/92859012
Fix adattributiond build in internal build on older macOS
https://bugs.webkit.org/show_bug.cgi?id=240184
<rdar://92859012>
Patch by Alex Christensen <achristen...@webkit.org> on 2022-05-06
Reviewed by Alexey Proskuryakov.
We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
* Configurations/adattributiond.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-7614.1.12-branch/Source/WebKit/ChangeLog (293963 => 293964)
--- branches/safari-7614.1.12-branch/Source/WebKit/ChangeLog 2022-05-09 03:55:22 UTC (rev 293963)
+++ branches/safari-7614.1.12-branch/Source/WebKit/ChangeLog 2022-05-09 04:04:59 UTC (rev 293964)
@@ -1,3 +1,32 @@
+2022-05-08 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r293936. rdar://problem/92859012
+
+ Fix adattributiond build in internal build on older macOS
+ https://bugs.webkit.org/show_bug.cgi?id=240184
+ <rdar://92859012>
+
+ Patch by Alex Christensen <achristen...@webkit.org> on 2022-05-06
+ Reviewed by Alexey Proskuryakov.
+
+ We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
+
+ * Configurations/adattributiond.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-05-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix adattributiond build in internal build on older macOS
+ https://bugs.webkit.org/show_bug.cgi?id=240184
+ <rdar://92859012>
+
+ Reviewed by Alexey Proskuryakov.
+
+ We need to search for WK_OVERRIDE_FRAMEWORKS_DIR to find the right frameworks
+
+ * Configurations/adattributiond.xcconfig:
+
2022-05-06 Alan Coon <alanc...@apple.com>
Cherry-pick r293818. rdar://problem/92751323
Modified: branches/safari-7614.1.12-branch/Source/WebKit/Configurations/adattributiond.xcconfig (293963 => 293964)
--- branches/safari-7614.1.12-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-09 03:55:22 UTC (rev 293963)
+++ branches/safari-7614.1.12-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-09 04:04:59 UTC (rev 293964)
@@ -35,4 +35,9 @@
WK_CODE_SIGN_FLAGS_iphoneos = --entitlements $(WK_PROCESSED_XCENT_FILE);
OTHER_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS);
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_OVERRIDE_FRAMEWORKS_DIR)
+
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
