diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-16 10:32:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-06-18 09:08:16 +0200 |
| commit | 0eed845ce2d76a1f2d8882cb32e1d36c30236d5e (patch) | |
| tree | 5a15eaa71eb973fabbd43b57f3576aa2e1bc7ad2 /Configurations/unix-Makefile.tmpl | |
| parent | 1abcd1e858ea4b1e924bdd8141d55b889cc2fbc2 (diff) | |
| download | openssl-new-0eed845ce2d76a1f2d8882cb32e1d36c30236d5e.tar.gz | |
Make util/wrap.pl work better on VMS
Perl's system() on VMS needs to have the command line properly fixed
up, even with arguments passed in list form. We arrange that by
having util/wrap.pl use the same command line fixups as OpenSSL::Test.
As a consequence, util/wrap.pl needs to be generated, to easily pick
up data from configdata.pm. This also removes yet another file
copying hack from the build file templates.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15791)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 553e51dfe5..2b894c0928 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1361,10 +1361,9 @@ tar: # Helper targets ##################################################### -link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl \ - $(BLDDIR)/apps/openssl.cnf +link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/apps/openssl.cnf -$(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl: configdata.pm +$(BLDDIR)/util/opensslwrap.sh: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ mkdir -p "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/`basename "$@"`" "$(BLDDIR)/util"; \ @@ -1924,6 +1923,7 @@ EOF rel2abs($config{builddir})); return <<"EOF"; $script: $sources configdata.pm + \$(RM) "$script" \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "-o$target{build_file}" $sources > "$script" chmod a+x $script |