Skip to content

Commit 21ad129

Browse files
authored
Merge pull request #10 from getditto/tk/1.43
Prep for 1.43.0 update and fix openssl linkage
2 parents 5633a92 + 75f5a0b commit 21ad129

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

build.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
set -euxo
33
source config.sh
44

5-
WORKING_DIR="$(pwd)/build"
6-
mkdir -p "$WORKING_DIR"
7-
5+
export OPENSSL_STATIC=1
6+
export OPENSSL_DIR=/usr/local/opt/openssl
7+
if [ ! -d "$OPENSSL_DIR" ]; then
8+
echo "OpenSSL not found at expected location. Try: brew install openssl"
9+
exit 1
10+
fi
811
if ! which ninja; then
912
echo "ninja not found. Try: brew install ninja"
1013
exit 1
@@ -14,6 +17,9 @@ if ! which cmake; then
1417
exit 1
1518
fi
1619

20+
WORKING_DIR="$(pwd)/build"
21+
mkdir -p "$WORKING_DIR"
22+
1723
cd "$WORKING_DIR"
1824
if [ ! -d "$WORKING_DIR/llvm-project" ]; then
1925
git clone https://github.com/apple/llvm-project.git

config.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# Apple Swift version 5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)
66
# Target: x86_64-apple-darwin19.3.0
77

8-
LLVM_BRANCH="tags/swift-5.1.3-RELEASE"
8+
LLVM_BRANCH="tags/swift-5.2.3-RELEASE"
99

1010
# 2. Select the best branch, tag or commit hash from https://github.com/rust-lang/rust
1111
# The stable 1.40.0 version of Rust seems to work
1212

13-
RUST_BRANCH="tags/1.40.0"
13+
RUST_BRANCH="tags/1.43.0"
1414

1515
# 3. Select a name for the toolchain you want to install as. The toolchain will be installed
1616
# under $HOME/.rust-ios-arm64/toolchain-$RUST_TOOLCHAIN
1717

18-
RUST_TOOLCHAIN="1.40.0"
18+
RUST_TOOLCHAIN="1.43.0"
1919

0 commit comments

Comments
 (0)