The branch master has been updated
via 9d46752dfecf26ccd62de33811eb30a19ffb87ac (commit)
from f4941736a97de6347d35f6a4bcc574d541e1164f (commit)
- Log -----------------------------------------------------------------
commit 9d46752dfecf26ccd62de33811eb30a19ffb87ac
Author: Andy Polyakov <ap...@openssl.org>
Date: Sun Aug 14 17:24:10 2016 +0200
Configure: recognize -static as link option and disable incompatible
options.
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Configure b/Configure
index bf5b2c6..0a33fc2 100755
--- a/Configure
+++ b/Configure
@@ -725,6 +725,13 @@ foreach (@argvcopy)
{
$libs.=$_." ";
}
+ elsif (/^-static$/)
+ {
+ $libs.=$_." ";
+ $disabled{"pic"} = "forced";
+ $disabled{"shared"} = "forced";
+ $disabled{"threads"} = "forced";
+ }
elsif (/^-D(.*)$/)
{
push @user_defines, $1;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
