Skip to content

Commit

Permalink
Merge pull request #10 from getditto/tk/1.43
Browse files Browse the repository at this point in the history
Prep for 1.43.0 update and fix openssl linkage
  • Loading branch information
thombles authored May 7, 2020
2 parents 5633a92 + 75f5a0b commit 21ad129
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 9 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
set -euxo
source config.sh

WORKING_DIR="$(pwd)/build"
mkdir -p "$WORKING_DIR"

export OPENSSL_STATIC=1
export OPENSSL_DIR=/usr/local/opt/openssl
if [ ! -d "$OPENSSL_DIR" ]; then
echo "OpenSSL not found at expected location. Try: brew install openssl"
exit 1
fi
if ! which ninja; then
echo "ninja not found. Try: brew install ninja"
exit 1
Expand All @@ -14,6 +17,9 @@ if ! which cmake; then
exit 1
fi

WORKING_DIR="$(pwd)/build"
mkdir -p "$WORKING_DIR"

cd "$WORKING_DIR"
if [ ! -d "$WORKING_DIR/llvm-project" ]; then
git clone https://github.com/apple/llvm-project.git
Expand Down
6 changes: 3 additions & 3 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# Apple Swift version 5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)
# Target: x86_64-apple-darwin19.3.0

LLVM_BRANCH="tags/swift-5.1.3-RELEASE"
LLVM_BRANCH="tags/swift-5.2.3-RELEASE"

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

RUST_BRANCH="tags/1.40.0"
RUST_BRANCH="tags/1.43.0"

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

RUST_TOOLCHAIN="1.40.0"
RUST_TOOLCHAIN="1.43.0"

0 comments on commit 21ad129

Please sign in to comment.