diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-07-08 12:00:06 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-07-09 09:21:36 +0200 |
| commit | 9e26532295c579afa91a3edf0864b380a5f0ec16 (patch) | |
| tree | 883ccbe11da57e15604978fa3c6b24b88f21a728 /Configurations | |
| parent | b7b13c7ac8d92adc6d81858b7a4cf27d54bf5563 (diff) | |
Keep supporting the env / make variable PERL
OpenSSL 1.1.0 supports the use of this environment variable for
passing to the build files. For the sake of backward compatibility,
we keep it.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/6668)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 70e566ef12..0c2695d2d1 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -180,7 +180,7 @@ CFLAGS={- join('', @{$config{CFLAGS}}) -} LDFLAGS={- join('', @{$config{LFLAGS}}) -} EX_LIBS={- join('', map { ",$_" } @{$config{LDLIBS}}) -} -PERL={- $config{perl} -} +PERL={- $config{PERL} -} AS={- $config{AS} -} ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 8d33e84318..2423ad2834 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -212,7 +212,7 @@ EX_LIBS= {- join(' ', @{$config{LDLIBS}}) -} MAKEDEPEND={- $config{makedepprog} -} -PERL={- $config{perl} -} +PERL={- $config{PERL} -} AR=$(CROSS_COMPILE){- $config{AR} -} ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 11acdf00f6..30fa5f9046 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -173,7 +173,7 @@ LD={- $config{LD} -} LDFLAGS={- join(' ', @{$config{LDFLAGS}}) -} EX_LIBS={- join(' ', @{$config{LDLIBS}}) -} -PERL={- $config{perl} -} +PERL={- $config{PERL} -} AR={- $config{AR} -} ARFLAGS= {- join(' ', @{$config{ARFLAGS}}) -} |