diff options
| author | Rickard Green <[email protected]> | 2010-08-30 11:28:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 11:28:19 +0200 |
| commit | c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (patch) | |
| tree | 1845b857d438783d20973d0789f16750978a4829 /erts | |
| parent | 980773b6f40133feff45b0ad9e811174b85034d9 (diff) | |
| parent | 22fe8c9f870f5b20f1cb9e740ff20a15331472f9 (diff) | |
| download | otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.tar.gz otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.tar.bz2 otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.zip | |
Merge branch 'rickard/ssl-cross/OTP-8791' into dev
* rickard/ssl-cross/OTP-8791:
Fix SSL build failure when building in minimal source tree
Fix SSL build failure when building in minimal source tree
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/erts/configure.in b/erts/configure.in index 5d02fd1ee4..d5dccdbb83 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -90,6 +90,13 @@ else host_os=$host fi +if test "$cross_compiling" = "yes"; then + CROSS_COMPILING=yes +else + CROSS_COMPILING=no +fi +AC_SUBST(CROSS_COMPILING) + ERL_XCOMP_SYSROOT_INIT AC_ISC_POSIX @@ -3605,10 +3612,10 @@ dnl Should one use EXEEXT or ac_exeext? if test -f "$erl_xcomp_sysroot$SSL_BINDIR/openssl$EXEEXT"; then if test "$cross_compiling" = "yes"; then dnl Cannot test it; hope it is working... - OPENSSL_CMD="$SSL_BINDIR/openssl" + OPENSSL_CMD="$erl_xcomp_sysroot$SSL_BINDIR/openssl$EXEEXT" else - if "$SSL_BINDIR/openssl" version > /dev/null 2>&1; then - OPENSSL_CMD="$SSL_BINDIR/openssl" + if "$SSL_BINDIR/openssl$EXEEXT" version > /dev/null 2>&1; then + OPENSSL_CMD="$SSL_BINDIR/openssl$EXEEXT" else is_real_ssl=no fi @@ -3617,6 +3624,9 @@ dnl Should one use EXEEXT or ac_exeext? is_real_ssl=no fi if test "x$is_real_ssl" = "xyes" ; then + if test "$MIXED_CYGWIN" = "yes"; then + OPENSSL_CMD=`cygpath -s -m "$OPENSSL_CMD"` 2> /dev/null + fi SSL_INCLUDE="-I$dir/include" old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$SSL_INCLUDE |