diff --git a/build_libcurl_dist.sh b/build_libcurl_dist.sh
index 57c60c4..8eef757 100755
--- a/build_libcurl_dist.sh
+++ b/build_libcurl_dist.sh
@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/bin/bash -euo pipefail
 
-export DEVROOT=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
+readonly XCODE_DEV="$(xcode-select -p)"
+export DEVROOT="${XCODE_DEV}/Toolchains/XcodeDefault.xctoolchain"
 DFT_DIST_DIR=${HOME}/Desktop/libcurl-ios-dist
 DIST_DIR=${DIST_DIR:-$DFT_DIST_DIR}
 
@@ -24,7 +25,7 @@ function build_for_arch() {
   ./configure --disable-shared --without-zlib --enable-static --enable-ipv6 ${SSL_FLAG} --host="${HOST}" --prefix=${PREFIX} && make -j8 && make install
 }
 
-if [ "$1" == "openssl" ]
+if [ "${1:-''}" == "openssl" ]
 then
   if [ ! -d ${HOME}/Desktop/openssl-ios-dist ]
   then
@@ -39,19 +40,19 @@ fi
 
 TMP_DIR=/tmp/build_libcurl_$$
 
-#build_for_arch i386 i386-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/i386 || exit 1
-build_for_arch x86_64 x86_64-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/x86_64 || exit 2
-build_for_arch arm64 arm-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/arm64 || exit 3
-build_for_arch armv7s armv7s-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7s || exit 4
-build_for_arch armv7 armv7-apple-darwin /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7 || exit 5
+build_for_arch i386 i386-apple-darwin ${XCODE_DEV}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/i386 || exit 1
+build_for_arch x86_64 x86_64-apple-darwin ${XCODE_DEV}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk ${TMP_DIR}/x86_64 || exit 2
+build_for_arch arm64 arm-apple-darwin ${XCODE_DEV}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/arm64 || exit 3
+build_for_arch armv7s armv7s-apple-darwin ${XCODE_DEV}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7s || exit 4
+build_for_arch armv7 armv7-apple-darwin ${XCODE_DEV}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk ${TMP_DIR}/armv7 || exit 5
 
 mkdir -p ${TMP_DIR}/lib/
 ${DEVROOT}/usr/bin/lipo \
-	-arch x86_64 ${TMP_DIR}/x86_64/lib/libcurl.a \
-	-arch armv7 ${TMP_DIR}/armv7/lib/libcurl.a \
-	-arch armv7s ${TMP_DIR}/armv7s/lib/libcurl.a \
-	-arch arm64 ${TMP_DIR}/arm64/lib/libcurl.a \
-	-output ${TMP_DIR}/lib/libcurl.a -create
+  -arch x86_64 ${TMP_DIR}/x86_64/lib/libcurl.a \
+  -arch armv7 ${TMP_DIR}/armv7/lib/libcurl.a \
+  -arch armv7s ${TMP_DIR}/armv7s/lib/libcurl.a \
+  -arch arm64 ${TMP_DIR}/arm64/lib/libcurl.a \
+  -output ${TMP_DIR}/lib/libcurl.a -create
 
 cp -r ${TMP_DIR}/arm64/include ${TMP_DIR}/