From 49654daa6b1ecf2126154466a9fccef4fc7ec2f5 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 3 Dec 2018 18:37:36 +0000 Subject: Checking Mac OS host for configuring OpenSSL OpenSSL can't automatically detect the architecture of Mac OS systems, so as it suggests on its Wiki, it needs some help for doing that. With this commit, we are checking the build on Mac OS with the presence of `otool' (Mac OS's linker). If it's there, we'll add the OpenSSL configuration options suggested by OpenSSL's Wiki. --- configure | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 2dfd3d3..31d5eb7 100755 --- a/configure +++ b/configure @@ -630,6 +630,22 @@ fi +# If we are on a Mac OS system +# ---------------------------- +# +# For the time being, we'll use the existance of `otool' to see if we are +# on a Mac OS system or not. Some tools (for example OpenSSL) need to know +# this. +if type otool > /dev/null 2>/dev/null; then + on_mac_os=yes +else + on_mac_os=no +fi + + + + + # Build Basic dependencies # ------------------------ # @@ -642,9 +658,10 @@ if which nproc > /dev/null 2>/dev/null; then numthreads=$(nproc --all); else numthreads=2; fi make -f reproduce/src/make/dependencies-basic.mk \ - static_build=$static_build \ rpath_command=$rpath_command \ + static_build=$static_build \ needs_ldl=$needs_ldl \ + on_mac_os=$on_mac_os \ #-j$numthreads -- cgit v1.2.1