summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-11-09 20:01:51 +0100
committerRichard Levitte <levitte@openssl.org>2016-11-10 15:51:42 +0100
commit186a31e510d1326063cfeca17e58fadec236ad2a (patch)
tree229bc2215ceeac6eac726c455a52be262e19b82d /Configure
parent42e055e12496a0eab72c64de845aa5bb18a9c4a2 (diff)
Building: make it possible to force linking with static OpenSSL libs
Very simply, support having the .a extension to denote depending on static libraries. Note that this is not supported on native Windows when building shared libraries, as there is not static library then, just an import library with the same name. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1889)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure7
1 files changed, 7 insertions, 0 deletions
diff --git a/Configure b/Configure
index 3289e9f1a7..307b1d8ac4 100755
--- a/Configure
+++ b/Configure
@@ -1856,9 +1856,16 @@ EOF
$d = cleanfile($buildd, $_, $blddir);
}
# Take note if the file to depend on is being renamed
+ # Take extra care with files ending with .a, they should
+ # be treated without that extension, and the extension
+ # should be added back after treatment.
+ $d =~ /(\.a)?$/;
+ my $e = $1 // "";
+ $d = $`;
if ($unified_info{rename}->{$d}) {
$d = $unified_info{rename}->{$d};
}
+ $d .= $e;
$unified_info{depends}->{$ddest}->{$d} = 1;
# If we depend on a header file or a perl module, let's make
# sure it can get included