diff options
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -566,7 +566,8 @@ my $idx_arflags = $idx++; my $prefix=""; my $openssldir=""; my $exe_ext=""; -my $install_prefix=""; +my $install_prefix="$ENV{'INSTALL_PREFIX'}"; +my $cross_compile_prefix="$ENV{'CROSS_COMPILE'}"; my $fipslibdir="/usr/local/ssl/lib/fips-1.0/"; my $nofipscanistercheck=0; my $fipsdso=0; @@ -1397,7 +1398,16 @@ while (<IN>) s/^PLATFORM=.*$/PLATFORM=$target/; s/^OPTIONS=.*$/OPTIONS=$options/; s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/; - s/^CC=.*$/CC= $cc/; + if ($cross_compile_prefix) + { + s/^CC=.*$/CROSS_COMPILE= $cross_compile_prefix\nCC= \$\(CROSS_COMPILE\)$cc/; + s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/; + s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/; + } + else { + s/^CC=.*$/CC= $cc/; + s/^RANLIB=.*/RANLIB= $ranlib/; + } s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; s/^CFLAG=.*$/CFLAG= $cflags/; s/^DEPFLAG=.*$/DEPFLAG= $depflags/; @@ -1416,7 +1426,6 @@ while (<IN>) s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $sha1_obj/; s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/; s/^PROCESSOR=.*/PROCESSOR= $processor/; - s/^RANLIB=.*/RANLIB= $ranlib/; s/^ARFLAGS=.*/ARFLAGS= $arflags/; s/^PERL=.*/PERL= $perl/; s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/; |