Skip to content

Commit 6b22d8a

Browse files
committed
iOS: Disable non-working arm64 simulator build
We have to wait for a resolution to tpoechtrager/cctools-port#102 or try a custom LLVM build with the proposed patch in that issue.
1 parent a4bcc74 commit 6b22d8a

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

Dockerfile.ios

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@ RUN dnf -y install --setopt=install_weak_deps=False \
1010
git clone --progress https://github.com/tpoechtrager/cctools-port.git && \
1111
cd /root/cctools-port && \
1212
git checkout 14ab64360c556c1263e022318ee4be1077d7a839 && \
13+
# arm64 device
1314
usage_examples/ios_toolchain/build.sh /root/files/iPhoneOS${IOS_SDK}.sdk.tar.xz arm64 && \
1415
mkdir -p /root/ioscross/arm64 && \
1516
mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64 && \
1617
mkdir /root/ioscross/arm64/usr && \
1718
ln -s /root/ioscross/arm64/bin /root/ioscross/arm64/usr/bin && \
18-
sed -i 's/miphoneos-version-min/mios-simulator-version-min/g' usage_examples/ios_toolchain/wrapper.c && \
19-
usage_examples/ios_toolchain/build.sh /root/files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz arm64 && \
20-
mkdir -p /root/ioscross/arm64_sim && \
21-
mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64_sim && \
22-
mkdir /root/ioscross/arm64_sim/usr && \
23-
ln -s /root/ioscross/arm64_sim/bin /root/ioscross/arm64_sim/usr/bin && \
19+
# arm64 simulator
20+
# Disabled for now as it doesn't work with cctools-port and current LLVM:
21+
# Cf. https://github.com/tpoechtrager/cctools-port/issues/102
22+
#sed -i 's/miphoneos-version-min/mios-simulator-version-min/g' usage_examples/ios_toolchain/wrapper.c && \
23+
#usage_examples/ios_toolchain/build.sh /root/files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz arm64 && \
24+
#mkdir -p /root/ioscross/arm64_sim && \
25+
#mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64_sim && \
26+
#mkdir /root/ioscross/arm64_sim/usr && \
27+
#ln -s /root/ioscross/arm64_sim/bin /root/ioscross/arm64_sim/usr/bin && \
28+
# x86_64 simulator
2429
sed -i 's#^TRIPLE=.*#TRIPLE="x86_64-apple-darwin11"#' usage_examples/ios_toolchain/build.sh && \
2530
usage_examples/ios_toolchain/build.sh /root/files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz x86_64 && \
2631
mkdir -p /root/ioscross/x86_64_sim && \
@@ -39,8 +44,8 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
3944
export MONO_SOURCE_ROOT=/root/${mono_version} && \
4045
python3 ios.py configure -j --verbose --target=arm64 --ios-toolchain ${IOSCROSS_ROOT}/arm64 --ios-sdk ${IOSCROSS_ROOT}/arm64/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \
4146
python3 ios.py make -j --verbose --target=arm64 && \
42-
python3 ios.py configure -j --verbose --target=arm64-sim --ios-toolchain ${IOSCROSS_ROOT}/arm64_sim --ios-sdk ${IOSCROSS_ROOT}/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \
43-
python3 ios.py make -j --verbose --target=arm64-sim && \
47+
#python3 ios.py configure -j --verbose --target=arm64-sim --ios-toolchain ${IOSCROSS_ROOT}/arm64_sim --ios-sdk ${IOSCROSS_ROOT}/arm64_sim/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \
48+
#python3 ios.py make -j --verbose --target=arm64-sim && \
4449
python3 ios.py configure -j --verbose --target=x86_64 --ios-toolchain ${IOSCROSS_ROOT}/x86_64_sim --ios-sdk ${IOSCROSS_ROOT}/x86_64_sim/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \
4550
python3 ios.py make -j --verbose --target=x86_64 && \
4651
python3 bcl.py make -j --product=ios && \

0 commit comments

Comments
 (0)