Skip to content

Commit 0a3ee5f

Browse files
authored
Merge pull request #50 from cavivie/main
Bump ios toolchains (libdispatch/libtapi/cctools-port)
2 parents 7ce22c5 + 8c60685 commit 0a3ee5f

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

docker/ios-wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
181181
}
182182

183183
args[i++] = osvermin;
184-
args[i++] = "-mlinker-version=609";
184+
args[i++] = "-mlinker-version=907";
185185
args[i++] = "-Wl,-adhoc_codesign";
186186
args[i++] = "-Wno-unused-command-line-argument";
187187

docker/ios.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ main() {
5555
local target="${1}"
5656
local target_cpu="${2}"
5757
local ldid_commit="4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab"
58-
local libtapi_commit="b7b5bdbfda9e8062d405b48da3b811afad98ae76"
59-
local cctools_commit="04663295d0425abfac90a42440a7ec02d7155fea"
58+
local libdispatch_commit="ee39300b12a77efd3f2f020e009e42d557adbb29"
59+
local libtapi_commit="b8c5ac40267aa5f6004dd38cc2b2cd84f2d9d555"
60+
local cctools_commit="a98286d858210b209395624477533c0bde05556a"
6061
local install_dir="/opt/cctools"
6162
local sdk_dir="${install_dir}"/SDK
6263

@@ -72,9 +73,9 @@ main() {
7273
libxml2-dev \
7374
zlib1g-dev \
7475
xz-utils \
75-
llvm-dev\
76-
uuid-dev\
77-
libdispatch0
76+
llvm-dev \
77+
uuid-dev \
78+
libstdc++-10-dev
7879

7980
local td
8081
td="$(mktemp -d)"
@@ -137,6 +138,8 @@ main() {
137138
./configure \
138139
--prefix="${install_dir}" \
139140
--with-libtapi="${install_dir}" \
141+
--with-libdispatch="${install_dir}" \
142+
--with-libblocksruntime="${install_dir}" \
140143
--target="${target}"
141144
make -j
142145
make install

0 commit comments

Comments
 (0)