Skip to content

Commit 882b91c

Browse files
committed
avoid checking x86_64 metadata when building for iOS (physical)
1 parent 55d00f8 commit 882b91c

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

build_nativescript.sh

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ mkdir -p $DIST/intermediates
5353

5454
function cmake_build () {
5555
local platform="$1"
56+
shift
57+
local archs=("$@")
5658
local is_macos_cli=false
5759

5860
if [ "$platform" == "macos-cli" ]; then
@@ -64,7 +66,7 @@ function cmake_build () {
6466

6567
if $EMBED_METADATA || $is_macos_cli; then
6668

67-
for arch in x86_64 arm64; do
69+
for arch in "${archs[@]}"; do
6870

6971
METADATA_SIZE=$(($METADATA_SIZE > $(stat -f%z "./metadata-generator/metadata/metadata.$platform.$arch.nsmd") ? $METADATA_SIZE : $(stat -f%z "./metadata-generator/metadata/metadata.$platform.$arch.nsmd")))
7072

@@ -80,50 +82,50 @@ function cmake_build () {
8082
if $BUILD_CATALYST; then
8183
checkpoint "Building NativeScript for Mac Catalyst"
8284

83-
# cmake_build catalyst
85+
# cmake_build catalyst x86_64 arm64
8486

8587
fi
8688

8789
if $BUILD_SIMULATOR; then
88-
checkpoint "Building NativeScript for iphone simulators (multi-arch)"
90+
checkpoint "Building NativeScript for iPhone (simulator)"
8991

90-
cmake_build ios-sim
92+
cmake_build ios-sim x86_64 arm64
9193

9294
fi
9395

9496
if $BUILD_IPHONE; then
95-
checkpoint "Building NativeScript for ARM64 device"
97+
checkpoint "Building NativeScript for iPhone (physical)"
9698

97-
cmake_build ios
99+
cmake_build ios arm64
98100

99101
fi
100102

101103
if $BUILD_MACOS; then
102104
checkpoint "Building NativeScript for macOS"
103105

104-
cmake_build macos
106+
cmake_build macos x86_64 arm64
105107

106108
cp "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/../packages/macos/dist/macos/NativeScript.node"
107109

108110
fi
109111

110112
if $BUILD_VISION; then
111113

112-
checkpoint "Building NativeScript for visionOS Device"
114+
checkpoint "Building NativeScript for visionOS (physical)"
113115

114-
# cmake_build visionos
116+
# cmake_build visionos arm64
115117

116-
checkpoint "Building NativeScript for visionOS Simulators"
118+
checkpoint "Building NativeScript for visionOS (simulator)"
117119

118-
# cmake_build visionos-sim
120+
# cmake_build visionos-sim x86_64 arm64
119121

120122
fi
121123

122124
if $BUILD_MACOS_CLI; then
123125

124126
checkpoint "Building NativeScript for macOS CLI"
125127

126-
cmake_build macos-cli
128+
cmake_build macos-cli x86_64 arm64
127129

128130
fi
129131

0 commit comments

Comments
 (0)