Skip to content

Commit 56bac5c

Browse files
committed
[API] Catalyst SDK headers include a macOS version, not "NA"
rdar://131880764 https://bugs.webkit.org/show_bug.cgi?id=276745 Reviewed by Alexey Proskuryakov. Treat macOS and Mac Catalyst as separate platforms in postprocess-header-rule, so that Catalyst does not inherit a macOS version string to include in its SDK headers. The only version that matters for Catalyst is iOS--since JavaScriptCore and WebKit are unzippered, anything importing them must be targeting apple-ios-macabi. * Source/JavaScriptCore/Scripts/postprocess-header-rule: * Source/WebKit/Scripts/postprocess-header-rule: Canonical link: https://commits.webkit.org/281107@main
1 parent e812e22 commit 56bac5c

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

Source/JavaScriptCore/Scripts/postprocess-header-rule

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ if [ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" == "YES" ]; then
5050
fi
5151

5252
if [[ "${JSC_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
53-
if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
53+
if [[ "${WK_PLATFORM_NAME}" == "macosx" ]]; then
5454
[[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
5555
[[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER=${TARGET_MAC_OS_X_VERSION_MAJOR}
5656
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
5757
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
58-
59-
if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
60-
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
61-
local ALIGNED_IOS_VERSION="${LLVM_TARGET_TRIPLE_OS_VERSION#ios}"
62-
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${ALIGNED_IOS_VERSION}
63-
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${ALIGNED_IOS_VERSION%%.*}
64-
else
65-
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
66-
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
67-
fi
58+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
59+
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
60+
elif [[ "${WK_PLATFORM_NAME}" == "maccatalyst" ]]; then
61+
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
62+
local ALIGNED_IOS_VERSION="${LLVM_TARGET_TRIPLE_OS_VERSION#ios}"
63+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${ALIGNED_IOS_VERSION}
64+
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${ALIGNED_IOS_VERSION%%.*}
65+
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
66+
[[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER="0"
67+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
6868
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
6969
elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
7070
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}

Source/WebKit/Scripts/postprocess-header-rule

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,15 @@ process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_defin
4747
# FIXME: rdar://90704735 (Run unifdef more uniformly on all WebKit.framework headers)
4848

4949
if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
50-
if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
50+
if [[ "${WK_PLATFORM_NAME}" == "macosx" ]]; then
5151
[[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
5252
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
53-
54-
if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
55-
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
56-
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${LLVM_TARGET_TRIPLE_OS_VERSION#ios}
57-
else
58-
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
59-
fi
53+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
54+
elif [[ "${WK_PLATFORM_NAME}" == "maccatalyst" ]]; then
55+
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
56+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${LLVM_TARGET_TRIPLE_OS_VERSION#ios}
57+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
58+
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
6059
elif [[ "${WK_PLATFORM_NAME}" =~ "iphone" ]]; then
6160
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
6261
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"

0 commit comments

Comments
 (0)