Skip to content

Commit

Permalink
Fix the build with older SDKs and newer Xcodes
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=257662
rdar://110185235

Reviewed by Elliott Williams.

* Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig:
It turns out this new TAPI flag is tied to the SDK, not the Xcode, so
change how we conditionalize it, in order to fix the build.

Canonical link: https://commits.webkit.org/264850@main
  • Loading branch information
hortont424 committed Jun 3, 2023
1 parent 0e5a15b commit 728f623
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,22 @@
DEFINES_MODULE = YES;
MODULEMAP_FILE = $(SRCROOT)/JavaScriptCore.modulemap;

SUPPORTS_TEXT_BASED_API = $(WK_AND_$(TAPI_USE_SRCROOT)_$(WK_NOT_$(WK_XCODE_BEFORE_15)));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_$(WK_PLATFORM_NAME));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_iphoneos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_IOS_17));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_iphonesimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_IOS_17));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_IOS_SINCE_17 = YES;
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_maccatalyst = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_MACCATALYST_14));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_MACCATALYST_SINCE_14 = YES;
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_macosx = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_MACOS_1400));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_MACOS_SINCE_1400 = YES;
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_appletvos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_TVOS_17));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_appletvsimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_TVOS_17));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_TVOS_SINCE_17 = YES;
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchsimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_WATCHOS_SINCE_10 = YES;

SUPPORTS_TEXT_BASED_API = $(WK_AND_$(TAPI_USE_SRCROOT)_$(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS));
TAPI_USE_SRCROOT = $(TAPI_USE_SRCROOT$(WK_XCODE_15));
TAPI_USE_SRCROOT_XCODE_SINCE_15 = YES;
TAPI_ENABLE_PROJECT_HEADERS = YES;
Expand Down

0 comments on commit 728f623

Please sign in to comment.