Skip to content

Commit 2afb699

Browse files
mMaxySpace Team
authored andcommitted
KT-80683: Extend Apple frameworks handling to include SubFrameworks
Xcode 26 introduces a new folder containing platform libraries. This commit adds support for that folder when building a list of Platform Libraries. ^KT-80683 fixed
1 parent db6b009 commit 2afb699

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

kotlin-native/tools/scripts/update_apple_frameworks.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ esac
5151

5252
DEFS=$NATIVE_SRCDIR/platformLibs/src/platform/$1
5353
FRAMEWORKS_DEV=$DEV_SDK/System/Library/Frameworks
54+
SUBFRAMEWORKS_DEV=$DEV_SDK/System/Library/SubFrameworks
5455
FRAMEWORKS_SIM=$SIM_SDK/System/Library/Frameworks
56+
SUBFRAMEWORKS_SIM=$SIM_SDK/System/Library/SubFrameworks
5557

5658
DEFS_FILE=$(mktemp)
5759
FRAMEWORKS_DEV_FILE=$(mktemp)
@@ -60,8 +62,8 @@ FRAMEWORKS_COMMON_FILE=$(mktemp)
6062
FRAMEWORKS_DEV_ONLY_FILE=$(mktemp)
6163
FRAMEWORKS_SIM_ONLY_FILE=$(mktemp)
6264
ls $DEFS | grep .def | cut -d '.' -f 1 > $DEFS_FILE
63-
ls $FRAMEWORKS_DEV | grep .framework | cut -d '.' -f 1 > $FRAMEWORKS_DEV_FILE
64-
ls $FRAMEWORKS_SIM | grep .framework | cut -d '.' -f 1 > $FRAMEWORKS_SIM_FILE
65+
{ ls "$FRAMEWORKS_DEV" 2>/dev/null || true; ls "$SUBFRAMEWORKS_DEV" 2>/dev/null || true; } | grep .framework | cut -d '.' -f 1 | sort -u > $FRAMEWORKS_DEV_FILE
66+
{ ls "$FRAMEWORKS_SIM" 2>/dev/null || true; ls "$SUBFRAMEWORKS_SIM" 2>/dev/null || true; } | grep .framework | cut -d '.' -f 1 | sort -u > $FRAMEWORKS_SIM_FILE
6567

6668
comm -12 $FRAMEWORKS_DEV_FILE $FRAMEWORKS_SIM_FILE > $FRAMEWORKS_COMMON_FILE
6769
comm -13 $FRAMEWORKS_DEV_FILE $FRAMEWORKS_SIM_FILE > $FRAMEWORKS_SIM_ONLY_FILE
@@ -212,7 +214,7 @@ then
212214
fi
213215
for framework in "${AVAILABLE[@]}"
214216
do
215-
if [[ -d $DEV_SDK/System/Library/Frameworks/$framework.framework/Modules ]]
217+
if [[ -d "$DEV_SDK/System/Library/Frameworks/$framework.framework/Modules" || -d "$DEV_SDK/System/Library/SubFrameworks/$framework.framework/Modules" ]]
216218
then
217219
create_def $framework
218220
else

0 commit comments

Comments
 (0)