Skip to content

Commit

Permalink
Fix SSL build failure when building in minimal source tree
Browse files Browse the repository at this point in the history
Building in a source tree without prebuilt platform independent
build results failed on the SSL examples when cross building.
This has been solved by not building the SSL examples during a
cross build.
  • Loading branch information
rickard-green committed Aug 27, 2010
1 parent 1b4a617 commit af62952
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fi
TARGET=$host
AC_SUBST(TARGET)

if test X$cross_compiling = Xyes; then
if test "$cross_compiling" = "yes"; then
CROSS_COMPILING=yes
else
CROSS_COMPILING=no
Expand Down
9 changes: 8 additions & 1 deletion erts/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3605,7 +3612,7 @@ 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"
else
if "$SSL_BINDIR/openssl" version > /dev/null 2>&1; then
OPENSSL_CMD="$SSL_BINDIR/openssl"
Expand Down
5 changes: 3 additions & 2 deletions lib/ssl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ ifeq ($(findstring win32,$(TARGET)),win32)
ifeq ($(HOST_OS),)
HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
endif
ifeq ($(findstring solaris,$(HOST_OS)),solaris)
SKIP_BUILDING_BINARIES := true
endif

ifeq ($(CROSS_COMPILING),yes)
SKIP_BUILDING_BINARIES := true
else
SKIP_BUILDING_BINARIES := false
endif
Expand Down
5 changes: 5 additions & 0 deletions make/otp.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
.SUFFIXES: .erl .beam .yrl .xrl .bin .mib .hrl .sgml .xml .xmlsrc .html .ps \
.3 .1 .fig .dvi .tex .class .java .pdf .fo .psframe .pscrop .el .elc

# ----------------------------------------------------
# Cross Compiling
# ----------------------------------------------------
CROSS_COMPILING = @CROSS_COMPILING@

# ----------------------------------------------------
# Common macros
# ----------------------------------------------------
Expand Down

0 comments on commit af62952

Please sign in to comment.