[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a66234bc86a959e628e2010687c6fdf0fdbfdac3 (commit)
      from  0110a4703608430c2131237c6afcf932a28c27ff (commit)


- Log -----------------------------------------------------------------
commit a66234bc86a959e628e2010687c6fdf0fdbfdac3
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 17 15:39:49 2016 +0200

    Configure: Properly cache the configured compiler command
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 4a7d322..b30b57f 100755
--- a/Configure
+++ b/Configure
@@ -500,7 +500,7 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
 	    if (grep(/^reconf/, at argvcopy));
 	$ENV{CROSS_COMPILE} = $configdata::config{cross_compile_prefix}
 	    if defined($configdata::config{cross_compile_prefix});
-	$ENV{CROSS_COMPILE} = $configdata::config{cc}
+	$ENV{CC} = $configdata::config{cc}
 	    if defined($configdata::config{cc});
 
 	print "Reconfiguring with: ", join(" ", at argvcopy), "\n";
@@ -938,6 +938,9 @@ $target{nm} =      $ENV{'NM'}      || $target{nm}      || "nm";
 $target{rc} =
     $ENV{'RC'}  || $ENV{'WINDRES'} || $target{rc}      || "windres";
 
+# Cache the C compiler command for reconfiguration
+$config{cc} = $target{cc};
+
 # For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_
 # or release_ attributes.
 # Do it in such a way that no spurious space is appended (hence the grep).