Skip to content

Commit

Permalink
Build fix for "[Xcode] Support building into a WebKit-specific produc…
Browse files Browse the repository at this point in the history
…ts directory for archival purposes"

https://bugs.webkit.org/show_bug.cgi?id=264214
rdar://117948754

Unreviewed.

Xcode's run action uses an in-process (non-XCBuild) codepath for
resolving build settings, which struggles to expand $(inherited) for
CONFIGURATION_BUILD_DIR (rdar://118201428).

Replace with a semantically equivalent definition that does not use
$(inherited).

* Configurations/WebKitProjectPaths.xcconfig:

Canonical link: https://commits.webkit.org/270507@main
  • Loading branch information
emw-apple committed Nov 10, 2023
1 parent 94a4dd8 commit 306fb53
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Configurations/WebKitProjectPaths.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREF
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)";

// Set WK_CONFIGURATION_BUILD_DIR to customize the directory WebKit builds into
// without affecting other projects in the build request. Avoid $(inherited)
// due to rdar://118201428.
CONFIGURATION_BUILD_DIR = $(CONFIGURATION_BUILD_DIR_$(WK_EMPTY_$(WK_CONFIGURATION_BUILD_DIR)));
CONFIGURATION_BUILD_DIR_ = $(WK_CONFIGURATION_BUILD_DIR);
CONFIGURATION_BUILD_DIR_YES = $(CONFIGURATION_BUILD_DIR);

WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
Expand Down

0 comments on commit 306fb53

Please sign in to comment.