Style nits and some extra robustness

Author: danielhenrymantilla

build.sh

@@ -3,7 +3,7 @@ set -euxo
 source config.sh
 
 export OPENSSL_STATIC=1
-export OPENSSL_DIR=/usr/local/opt/openssl
+export OPENSSL_DIR=/usr/local/opt/openssl  # for cimac3: /opt/homebrew/opt/openssl@3
 if [ ! -d "$OPENSSL_DIR" ]; then
     echo "OpenSSL not found at expected location. Try: brew install openssl"
     exit 1
@@ -19,35 +19,53 @@ fi
 
 WORKING_DIR="$(pwd)/build"
 mkdir -p "$WORKING_DIR"
-
 cd "$WORKING_DIR"
-if [ ! -d "$WORKING_DIR/llvm-project" ]; then
-    git clone --depth 1 --branch "$LLVM_BRANCH" https://github.com/apple/llvm-project.git
+
+if [ ! -d "llvm-project" ]; then
+    git clone \
+        --shallow-since="1 year" --no-single-branch \
+        https://github.com/apple/llvm-project.git \
+    ;
 fi
-cd "$WORKING_DIR/llvm-project"
-git reset --hard
-git clean -f
-git checkout "$LLVM_BRANCH"
-git apply ../../patches/llvm-system-libs.patch
-cd ..
+(cd "llvm-project"
+    git reset --hard
+    git clean -f
+    git checkout "$LLVM_BRANCH"
+    git apply ../../patches/llvm-system-libs.patch
+)
 
 mkdir -p llvm-build
-cd llvm-build
-cmake "$WORKING_DIR/llvm-project/llvm" -DCMAKE_INSTALL_PREFIX="$WORKING_DIR/llvm-root" -DCMAKE_BUILD_TYPE=Release -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64' -G Ninja
-ninja
-ninja install
+(cd llvm-build
+    cmake \
+        "$WORKING_DIR/llvm-project/llvm" \
+        -DCMAKE_INSTALL_PREFIX="$WORKING_DIR/llvm-root" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DLLVM_INSTALL_UTILS=ON \
+        -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64' \
+        -G Ninja \
+    ;
+    ninja
+    ninja install
+)
 
-cd "$WORKING_DIR"
-if [ ! -d "$WORKING_DIR/rust" ]; then
+if [ ! -d "rust" ]; then
     git clone https://github.com/rust-lang/rust.git
 fi
-cd rust
-git reset --hard
-git clean -f
-git checkout "$RUST_BRANCH"
-cd ..
+(cd rust
+    git reset --hard
+    git clean -f
+    git checkout "$RUST_BRANCH"
+)
+
 mkdir -p rust-build
-cd rust-build
-../rust/configure --llvm-config="$WORKING_DIR/llvm-root/bin/llvm-config" --target=aarch64-apple-ios --enable-extended --tools=cargo --release-channel=nightly
-export CFLAGS_aarch64_apple_ios=-fembed-bitcode
-python "$WORKING_DIR/rust/x.py" build --stage 2
+(cd rust-build
+    ../rust/configure \
+        --llvm-config="$WORKING_DIR/llvm-root/bin/llvm-config" \
+        --target=aarch64-apple-ios \
+        --enable-extended \
+        --tools=cargo \
+        --release-channel=nightly \
+    ;
+    CFLAGS_aarch64_apple_ios=-fembed-bitcode \
+        python "$WORKING_DIR/rust/x.py" build --stage 2
+)

dist.sh

@@ -2,11 +2,14 @@
 set -euxo
 source config.sh
 
+HOST_ARCH="$(rustc -vV | sed -nE 's/host: (.*)/\1/p')"
+
 # The built toolchain that we are going to package
-WORKING_DIR="$(pwd)/build"
+WORKING_DIR="${PWD}/build"
+BUILT_TOOLCHAIN_DIR="${WORKING_DIR}/rust-build/build/${HOST_ARCH}"
 
 # The directory which will be added to the final zip file
-DEST="$(pwd)/dist/rust-${RUST_TOOLCHAIN}"
+DEST="${PWD}/dist/rust-${RUST_TOOLCHAIN}"
 
 # The actual toolchain inside that, which will be installed to ~/.rustup/...
 TOOLCHAIN_DEST="${DEST}/${RUST_TOOLCHAIN}"
@@ -15,22 +18,34 @@ rm -rf "$DEST"
 mkdir -p "$TOOLCHAIN_DEST"
 
 # Remove unneeded files from output
-rm -rf "$WORKING_DIR/rust-build/build/x86_64-apple-darwin/stage2/lib/rustlib/src"
+rm -rf "${BUILT_TOOLCHAIN_DIR}/stage2/lib/rustlib/src"
 
 # Copy in toolchain artifacts
-cp -r "$WORKING_DIR/rust-build/build/x86_64-apple-darwin/stage2"/* "$TOOLCHAIN_DEST"
-cp -r "$WORKING_DIR/rust-build/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/cargo" "$TOOLCHAIN_DEST/bin"
+cp -r \
+    "${BUILT_TOOLCHAIN_DIR}/stage2"/* \
+    "$TOOLCHAIN_DEST" \
+;
+cp -r \
+    "${BUILT_TOOLCHAIN_DIR}/stage2-tools/$HOST_ARCH/release/cargo" \
+    "$TOOLCHAIN_DEST/bin" \
+;
 
 # Copy in static files that need to be included in the distribution
 cp LICENSE* README.md "$DEST"
 
-echo "#!/bin/bash" >> "$DEST/install.sh"
-echo "DEST_TOOLCHAIN=\"\$HOME/.rustup/toolchains/$RUST_TOOLCHAIN\"" >> "$DEST/install.sh"
-echo "mkdir -p \"\$DEST_TOOLCHAIN\"" >> $DEST/install.sh
-echo "cp -r \"$RUST_TOOLCHAIN\"/* \"\$DEST_TOOLCHAIN\"" >> "$DEST/install.sh"
-chmod +x "$DEST/install.sh"
+sed 's/^    //' >"$DEST/install.sh"<<EOF
+    #!/bin/bash
+    set -euxo pipefail
+
+    DEST_TOOLCHAIN="\$HOME/.rustup/toolchains/${RUST_TOOLCHAIN}"
+    mkdir -p "\$DEST_TOOLCHAIN"
+    cp -r "${RUST_TOOLCHAIN}"/* "\$DEST_TOOLCHAIN"
+    chmod +x "${DEST}/install.sh"
+
+    echo "Installed bitcode-enabled Rust toolchain. Use with: +${RUST_TOOLCHAIN}"
+EOF
 
-cd dist
-rm -f "rust-${RUST_TOOLCHAIN}.zip"
-zip -r "rust-${RUST_TOOLCHAIN}.zip" "rust-${RUST_TOOLCHAIN}"
-cd ..
+(cd dist
+    rm -f "rust-${RUST_TOOLCHAIN}.zip"
+    zip -r "rust-${RUST_TOOLCHAIN}.zip" "rust-${RUST_TOOLCHAIN}"
+)