diff options
author | Richard Levitte <levitte@openssl.org> | 2016-02-11 12:59:33 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-11 17:08:38 +0100 |
commit | 1407f856ab790f8028db1ecfb354d64bfb8ca054 (patch) | |
tree | e968c1c70c473949d6cd66e74443d98dc4ef5c4a | |
parent | cedbb1462a1732bf255c4b7767d8a0e4e0d20e30 (diff) | |
download | openssl-1407f856ab790f8028db1ecfb354d64bfb8ca054.tar.gz |
Make util/mkrc.pl location agnostic and adapt Makefile.shared
With this, Cygwin and Mingw builds stand a much better chance to be
able to build outside of the source tree with the unified build.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r-- | Makefile.shared | 2 | ||||
-rwxr-xr-x | util/mkrc.pl | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.shared b/Makefile.shared index 29e180845a..26ea561a72 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -308,7 +308,7 @@ link_a.cygwin: base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \ fi; \ dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ - $(PERL) util/mkrc.pl $$dll_name | \ + $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \ $(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o; \ extras="$$extras rc.o"; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ diff --git a/util/mkrc.pl b/util/mkrc.pl index e20a50283c..8b74ff8adc 100755 --- a/util/mkrc.pl +++ b/util/mkrc.pl @@ -1,6 +1,13 @@ #!/bin/env perl # -open FD,"include/openssl/opensslv.h"; + +use lib "."; +use configdata; +use File::Spec::Functions; + +my $versionfile = catfile($config{sourcedir},"include/openssl/opensslv.h"); + +open FD, $versionfile or die "Couldn't open include/openssl/opensslv.h: $!\n"; while(<FD>) { if (/OPENSSL_VERSION_NUMBER\s+(0x[0-9a-f]+)/i) { $ver = hex($1); |