[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a450326ee040c6cbb262debdb1ed731e6700e1e0 (commit)
      from  96d608beb0ab4a005140df0bfe028a4ccf351878 (commit)


- Log -----------------------------------------------------------------
commit a450326ee040c6cbb262debdb1ed731e6700e1e0
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 29 17:21:18 2016 +0100

    Don't replace cflags with thread_cflags, only append the latter
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 6d36ae1..e1d1989 100755
--- a/Configure
+++ b/Configure
@@ -932,7 +932,7 @@ if ($no_asm)
 
 if ($threads)
 	{
-	$config{cflags}=$thread_cflags;
+	$config{cflags}.=$thread_cflags;
 	push @{$config{openssl_thread_defines}}, @thread_defines;
 	}