From 9475f6e2f3d9d3a0af7da013fa2aa08090517d27 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 27 Aug 2018 13:25:10 +0200
Subject: Fix crypto configure on Darwin

---
 erts/aclocal.m4         | 22 +++++++++++++++-------
 lib/crypto/configure.in |  5 -----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index b16034eb2c..0ca2755802 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -2999,13 +2999,21 @@ case $host_os in
 		# Mach-O linker: a shared lib and a loadable
 		# object file is not the same thing.
 		DED_LDFLAGS="-bundle -bundle_loader ${ERL_TOP}/bin/$host/beam.smp"
-		case $ARCH in
-			amd64)
-				DED_LDFLAGS="-m64 $DED_LDFLAGS"
-				;;
-			*)
-				;;
-		esac
+		if test X${enable_m64_build} = Xyes; then
+		  DED_LDFLAGS="-m64 $DED_LDFLAGS"
+		else
+		  if test X${enable_m32_build} = Xyes; then
+		    DED_LDFLAGS="-m32 $DED_LDFLAGS"
+		  else
+		    AC_CHECK_SIZEOF(void *)
+		    case "$ac_cv_sizeof_void_p" in
+		      8)
+			DED_LDFLAGS="-m64 $DED_LDFLAGS";;
+		      *)
+		        ;;
+		    esac
+		  fi
+		fi
 		DED_LD="$CC"
 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
 	;;
diff --git a/lib/crypto/configure.in b/lib/crypto/configure.in
index 3e54371198..a3b6673f29 100644
--- a/lib/crypto/configure.in
+++ b/lib/crypto/configure.in
@@ -66,11 +66,6 @@ dnl use "PATH/include" and "PATH/lib".
 
 AC_CHECK_SIZEOF(void *)
 
-CC=$DED_CC
-CFLAGS=$DED_BASIC_CFLAGS
-LD=$DED_LD
-LDFLAGS=$DED_LDFLAGS
-
 std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /"
 
 AC_ARG_WITH(ssl-zlib,
-- 
cgit v1.2.3