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/10-main.conf | |
| 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/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 70b01046e7..b17a7803b3 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -580,7 +580,7 @@ my %targets = ( cc => "gcc", cflags => "-O3", cppflags => "-D_ENDIAN -DBN_DIV2W -D_POSIX_SOURCE -D_SOCKET_SOURCE", - includes => [ "/SYSLOG/PUB" ], + includes => add("/SYSLOG/PUB"), sys_id => "MPE", lflags => add("-L/SYSLOG/PUB"), ex_libs => add("-lsyslog -lsocket -lcurses"), @@ -1444,10 +1444,11 @@ my %targets = ( "NO_CHMOD", "OPENSSL_SMALL_FOOTPRINT" ], debug => [ "DEBUG", "_DEBUG" ]), includes => - combine(sub { defined(env('WCECOMPAT')) - ? '$(WCECOMPAT)/include' : (); }, - sub { defined(env('PORTSDK_LIBPATH')) - ? '$(PORTSDK_LIBPATH)/../../include' : (); }), + add(combine(sub { defined(env('WCECOMPAT')) + ? '$(WCECOMPAT)/include' : (); }, + sub { defined(env('PORTSDK_LIBPATH')) + ? '$(PORTSDK_LIBPATH)/../../include' + : (); })), lflags => add(combine("/nologo /opt:ref", sub { vc_wince_info()->{lflags}; }, sub { defined(env('PORTSDK_LIBPATH')) |