[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a33b13128fd141baaea72b038a502a7904138d91 (commit)
      from  6f84b383d3c19a1993f08cdfa9a23d7649161823 (commit)


- Log -----------------------------------------------------------------
commit a33b13128fd141baaea72b038a502a7904138d91
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 20:39:58 2016 +0100

    Quick fix of debugging option for mk1mf.pl.
    
    util/mk1mf.pl was relying on the platform having the 'debug-' prefix
    for doing a debug build.  Since the setup of targets has changed, this
    is no longer true.  However, it can look for '--debug' in the command
    line options.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 util/mk1mf.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index bac5a6f..64ad29a 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -83,8 +83,6 @@ while(<IN>) {
 }
 close(IN);
 
-$debug = 1 if $mf_platform =~ /^debug-/;
-
 if ($mf_fipscanisterinternal eq "y") {
 	$fips = 1;
 	$fipscanisterbuild = 1;
@@ -1401,6 +1399,7 @@ sub read_options
 		"rsaref" => 0,
 		"gcc" => \$gcc,
 		"debug" => \$debug,
+		"--debug" => \$debug,
 		"profile" => \$profile,
 		"shlib" => \$shlib,
 		"dll" => \$shlib,