diff options
| author | Rickard Green <[email protected]> | 2018-08-28 16:58:06 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-28 16:58:06 +0200 |
| commit | 0e0398dd50976f24294758c812c97c54e42eba21 (patch) | |
| tree | a3ce844ae5a0c12754cbf3da6d3e12ebeb2f28d6 /erts | |
| parent | 547b4ec00465a9fb8be40772b6bcc3609d92a0d1 (diff) | |
| parent | 9475f6e2f3d9d3a0af7da013fa2aa08090517d27 (diff) | |
| download | otp-0e0398dd50976f24294758c812c97c54e42eba21.tar.gz otp-0e0398dd50976f24294758c812c97c54e42eba21.tar.bz2 otp-0e0398dd50976f24294758c812c97c54e42eba21.zip | |
Merge branch 'rickard/crypto-configure/OTP-15129'
* rickard/crypto-configure/OTP-15129:
Fix crypto configure on Darwin
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/aclocal.m4 | 22 |
1 files changed, 15 insertions, 7 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" ;; |