aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2016-08-14 17:24:10 +0200
committerAndy Polyakov <appro@openssl.org>2016-08-16 12:45:51 +0200
commit9d46752dfecf26ccd62de33811eb30a19ffb87ac (patch)
tree98cebed21695614f5a5a04a842aa5ff85c917a89
parentf4941736a97de6347d35f6a4bcc574d541e1164f (diff)
downloadopenssl-9d46752dfecf26ccd62de33811eb30a19ffb87ac.tar.gz
Configure: recognize -static as link option and disable incompatible options.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rwxr-xr-xConfigure7
1 files changed, 7 insertions, 0 deletions
diff --git a/Configure b/Configure
index bf5b2c667c..0a33fc2e41 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;