diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-10 02:28:39 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-09-12 01:59:46 +0200 |
| commit | 9dfc868025721873952f7765e59ae9fee45a276a (patch) | |
| tree | eb76c8f7c53654a24ff8380753470a85fda7e5ff /Configurations/windows-makefile.tmpl | |
| parent | bec2db1809df52f6e6548e7e883cdc7fec79964a (diff) | |
Build files: Separate 'lib' intent from 'shlib' intent
This is in preparation for having separate CFLAGS variables for static
and for shared library builds.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7159)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index f7d8e273c4..c8b0cf1c31 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -531,6 +531,7 @@ EOF my $cppflags = $incs; $cppflags .= { + shlib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)', lib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)', dso => ' $(DSO_CFLAGS) $(DSO_CPPFLAGS)', bin => ' $(BIN_CFLAGS) $(BIN_CPPFLAGS)' @@ -568,14 +569,17 @@ EOF my $srcs = '"'.join('" "', @srcs).'"'; my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}}); - my $cflags = { lib => ' $(LIB_CFLAGS)', + my $cflags = { shlib => ' $(LIB_CFLAGS)', + lib => ' $(LIB_CFLAGS)', dso => ' $(DSO_CFLAGS)', bin => ' $(BIN_CFLAGS)' } -> {$args{intent}}; $cflags .= $incs; - $cflags .= { lib => ' $(LIB_CPPFLAGS)', + $cflags .= { shlib => ' $(LIB_CPPFLAGS)', + lib => ' $(LIB_CPPFLAGS)', dso => ' $(DSO_CPPFLAGS)', bin => ' $(BIN_CPPFLAGS)' } -> {$args{intent}}; - my $asflags = { lib => ' $(LIB_ASFLAGS)', + my $asflags = { shlib => ' $(LIB_ASFLAGS)', + lib => ' $(LIB_ASFLAGS)', dso => ' $(DSO_ASFLAGS)', bin => ' $(BIN_ASFLAGS)' } -> {$args{intent}}; my $makedepprog = $config{makedepprog}; |