aboutsummaryrefslogtreecommitdiffstats
path: root/kerl
diff options
context:
space:
mode:
authorMark Allen <[email protected]>2016-04-20 09:51:21 -0500
committerMark Allen <[email protected]>2016-04-20 09:51:21 -0500
commitba8557b37a25410976d8a659f12ee65a6cdc2561 (patch)
tree94c2c83d6c001efe1fb63bc89430633e5ad92c74 /kerl
parenta1267ac340042d41cd8d8e62b776bc4f8d322631 (diff)
parentd7aa3341f23464e6cf990877956d00bd0bce2adb (diff)
downloadkerl-ba8557b37a25410976d8a659f12ee65a6cdc2561.tar.gz
kerl-ba8557b37a25410976d8a659f12ee65a6cdc2561.tar.bz2
kerl-ba8557b37a25410976d8a659f12ee65a6cdc2561.zip
Merge pull request #121 from kerl/gh1200.9.2
Address install issues
Diffstat (limited to 'kerl')
-rwxr-xr-xkerl26
1 files changed, 13 insertions, 13 deletions
diff --git a/kerl b/kerl
index e90ba5e..4b9833a 100755
--- a/kerl
+++ b/kerl
@@ -219,12 +219,14 @@ get_release_from_name()
get_newest_valid_release()
{
check_releases
- while read -r rel; do
- if [ ! -z "$rel" ]; then
- echo "$rel"
- return 0
- fi
- done < "$KERL_BASE_DIR"/otp_releases | tail -1
+
+ rel=$(tail -1 "$KERL_BASE_DIR"/otp_releases)
+
+ if [ ! -z "$rel" ]; then
+ echo "$rel"
+ return 0
+ fi
+
return 1
}
@@ -365,12 +367,7 @@ do_build()
xc_ssl='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr'
if [ -d "$xc_ssl/include/openssl" ]
then
- if [ $RELVERSION -ge 17 ]
- then
- KERL_CONFIGURE_OPTIONS="$KERL_CONFIGURE_OPTIONS --with-ssl --with-ssl-incl=$xc_ssl"
- else
- KERL_CONFIGURE_OPTIONS="$KERL_CONFIGURE_OPTIONS --with-ssl=$xc_ssl"
- fi
+ KERL_CONFIGURE_OPTIONS="$KERL_CONFIGURE_OPTIONS --with-ssl=$xc_ssl"
else
echo 'WARNING: No OpenSSL library was found in the usual places. Your Erlang will be built without crypto support!'
fi
@@ -424,7 +421,10 @@ do_build()
fi
if [ $? -ne 0 ]; then
- echo "Build failed, see $LOGFILE"
+ echo "Build failed:"
+ tail "$LOGFILE"
+ echo
+ echo "Please see $LOGFILE for full details."
list_remove builds "$1 $2"
exit 1
fi