aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Allen <[email protected]>2017-05-24 01:32:47 -0500
committerGitHub <[email protected]>2017-05-24 01:32:47 -0500
commitb3f2cba3681f6539685e746b46a634cffbbce54c (patch)
tree75caa5d924c8d57087b2e49c9f08c296ad641803
parent7efeb2bd4675b6250b4b724beba9ac250fee932c (diff)
parentce37d87ff1a706e6e3cad1ea06fbcdc8eef3071e (diff)
downloadkerl-b3f2cba3681f6539685e746b46a634cffbbce54c.tar.gz
kerl-b3f2cba3681f6539685e746b46a634cffbbce54c.tar.bz2
kerl-b3f2cba3681f6539685e746b46a634cffbbce54c.zip
Merge pull request #205 from kerl/force_64_bits_macos
Always turn on 64 bit builds for macOS
-rwxr-xr-xkerl9
1 files changed, 9 insertions, 0 deletions
diff --git a/kerl b/kerl
index 000a09a..e0cf1f3 100755
--- a/kerl
+++ b/kerl
@@ -543,6 +543,15 @@ _do_build()
Darwin)
OSVERSION=`uname -r`
RELVERSION=`get_otp_version "$1"`
+
+ # Ensure that the --enable-darwin-64bit flag is set on all macOS
+ # That way even on older Erlangs we get 64 bit Erlang builds
+ # macOS has been mandatory 64 bit for a while
+ echo -n $KERL_CONFIGURE_OPTIONS | grep "darwin-64bit" 1>/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ KERL_CONFIGURE_OPTIONS = "$KERL_CONFIGURE_OPTIONS --enable-darwin-64bit"
+ fi
+
case "$OSVERSION" in
16*|15*)
echo -n $KERL_CONFIGURE_OPTIONS | grep "ssl" 1>/dev/null 2>&1