diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-03-27 01:41:00 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-03-31 15:21:18 +0200 |
| commit | 8bf5b8ab22ccab31ff74d352dd370d81267e09a7 (patch) | |
| tree | 9537817bca2cc8f6af38b477255db45d9a42b488 /util/mk1mf.pl | |
| parent | e93c8748ab40d876285147e3112c7a520d68880e (diff) | |
| download | openssl-8bf5b8ab22ccab31ff74d352dd370d81267e09a7.tar.gz | |
Fix some faults in util/mk1mf.pl
When building on Unix, there are times when the 'EX_LIB' MINFO variable
contains valuable information. Make sure to take care of it.
fixrules in util/pl/unix.pl was previously changed with a simpler fix of
rules, with a comment claiming that's compatible with -j. Unfortunately,
this breaks multiline rules and doesn't change anything for single line
rules. While at it, do not prefix pure echo lines with a 'cd $(TEST_D) &&',
as that's rather silly.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index d3379d2a16..3ad17f629b 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -393,6 +393,9 @@ for (;;) if ($key eq "LIBKRB5") { $ex_libs .= " $val" if $val ne "";} + if ($key eq "EX_LIBS") + { $ex_libs .= " $val" if $val ne "";} + if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ )) { $test.=&var_add($dir,$val, 0); } |