diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-14 22:06:49 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-14 23:16:29 +0100 |
| commit | 0756592b60d7d2bcb64f7ca01ec1430c43b1cf26 (patch) | |
| tree | 6883624c1e40406fbb20ef96a9067e19424edf0f /util | |
| parent | 795e1231738ccebecfa031ecc4da75fcdd4ffc0a (diff) | |
Misc fixes in util/mk1mf.pl
mk1mf was wondering about the options no-heartbeats and
no-crypto-mdebug-backtrace, so we add option hooks them. They only
need to become OPENSSL_NO_ macros in opensslconf.h, so nothing
additional needs to be done.
Also, add "-DOPENSSL_PIC" when shared libraries are produced.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'util')
| -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 f29e50bb77..4b5acbe81b 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -310,6 +310,7 @@ $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; $cflags.= " -DZLIB" if $zlib_opt; $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; +$cflags.=" -DOPENSSL_PIC" if $shlib; if ($no_static_engine) { @@ -1405,6 +1406,7 @@ sub read_options "no-gost" => \$no_gost, "no-engine" => \$no_engine, "no-egd" => 0, + "no-heartbeats" => 0, "no-hw" => \$no_hw, "no-async" => \$no_async, "no-autoalginit" => \$no_autoalginit, @@ -1436,6 +1438,7 @@ sub read_options "no-deprecated" => 0, "no-ocb" => 0, "no-crypto-mdebug" => 0, + "no-crypto-mdebug-backtrace" => 0, "fips" => \$fips, "fipscanisterbuild" => [\$fips, \$fipscanisterbuild], "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly], |