diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-08 23:26:22 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-09 14:27:31 +0100 |
| commit | 368297d17352c7eb30efff443509caf7cf59f65f (patch) | |
| tree | 27c18b58b59cbf197372b28404327dbb1d7c7c9c /Configurations/unix-Makefile.tmpl | |
| parent | f3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff (diff) | |
Configuration: move the handling of zlib_include to config files
It was a bit absurd to have this being specially handled in the build
file templates, especially that we have the 'includes' attribute.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5296)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 9e05fd1d5f..3c80fec37b 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -891,11 +891,6 @@ EOF my $srcs = join(" ", @srcs); my $deps = join(" ", @srcs, @{$args{deps}}); my $incs = join("", map { " -I".$_ } @{$args{incs}}); - unless ($disabled{zlib}) { - if ($withargs{zlib_include}) { - $incs .= " -I".$withargs{zlib_include}; - } - } my $cmd = '$(CC)'; my $cmdflags = '$(CFLAGS)'; my $cmdcompile = ' -c'; |