Title: [293962] branches/safari-614.1.11-branch/Source/WebKit
- Revision
- 293962
- Author
- repst...@apple.com
- Date
- 2022-05-08 20:54:14 -0700 (Sun, 08 May 2022)
Log Message
Cherry-pick r293945. rdar://problem/92859012
Fix another internal build
https://bugs.webkit.org/show_bug.cgi?id=240201
<rdar://92859012>
Patch by Alex Christensen <achristen...@webkit.org> on 2022-05-06
Reviewed by Alexey Proskuryakov.
Bug 240184 introduced a classic "but I have spaces in my path" bug.
* Configurations/adattributiond.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293945 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.11-branch/Source/WebKit/ChangeLog (293961 => 293962)
--- branches/safari-614.1.11-branch/Source/WebKit/ChangeLog 2022-05-09 03:54:11 UTC (rev 293961)
+++ branches/safari-614.1.11-branch/Source/WebKit/ChangeLog 2022-05-09 03:54:14 UTC (rev 293962)
@@ -1,5 +1,34 @@
2022-05-08 Russell Epstein <repst...@apple.com>
+ Cherry-pick r293945. rdar://problem/92859012
+
+ Fix another internal build
+ https://bugs.webkit.org/show_bug.cgi?id=240201
+ <rdar://92859012>
+
+ Patch by Alex Christensen <achristen...@webkit.org> on 2022-05-06
+ Reviewed by Alexey Proskuryakov.
+
+ Bug 240184 introduced a classic "but I have spaces in my path" bug.
+
+ * Configurations/adattributiond.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293945 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-05-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix another internal build
+ https://bugs.webkit.org/show_bug.cgi?id=240201
+ <rdar://92859012>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Bug 240184 introduced a classic "but I have spaces in my path" bug.
+
+ * Configurations/adattributiond.xcconfig:
+
+2022-05-08 Russell Epstein <repst...@apple.com>
+
Cherry-pick r293936. rdar://problem/92859012
Fix adattributiond build in internal build on older macOS
Modified: branches/safari-614.1.11-branch/Source/WebKit/Configurations/adattributiond.xcconfig (293961 => 293962)
--- branches/safari-614.1.11-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-09 03:54:11 UTC (rev 293961)
+++ branches/safari-614.1.11-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-05-09 03:54:14 UTC (rev 293962)
@@ -38,6 +38,9 @@
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)
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_QUOTED_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
