[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f8206c8e24ddc502c6ed1652824b2c6dc886fb5e (commit)
      from  723acb144551e7d81ec2e745d12fc8b6a6513eb1 (commit)


- Log -----------------------------------------------------------------
commit f8206c8e24ddc502c6ed1652824b2c6dc886fb5e
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 29 18:00:10 2016 +0100

    Revert "Don't replace cflags with thread_cflags, only append the latter"
    
    This reverts commit a450326ee040c6cbb262debdb1ed731e6700e1e0.
    
    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 e1d1989..6d36ae1 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;
 	}