From: Richard Levitte <levitte@openssl.org>
Date: Fri, 29 Jan 2016 17:00:10 +0000 (+0100)
Subject: Revert "Don't replace cflags with thread_cflags, only append the latter"
X-Git-Tag: OpenSSL_1_1_0-pre3~371
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f8206c8e24ddc502c6ed1652824b2c6dc886fb5e;p=oweals%2Fopenssl.git

Revert "Don't replace cflags with thread_cflags, only append the latter"

This reverts commit a450326ee040c6cbb262debdb1ed731e6700e1e0.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configure b/Configure
index e1d1989352..6d36ae1a6b 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;
 	}