diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-12 09:38:20 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-13 00:02:55 +0100 |
| commit | bbd9a50fa8e371927c290170ab6b8ac2597e5ff9 (patch) | |
| tree | 79e06f0a95a5a3269bffa04c124d6572375f0f52 /Configurations/windows-makefile.tmpl | |
| parent | 8cab4e9bc73a66b64aae179db86493fd28c39b64 (diff) | |
| download | openssl-bbd9a50fa8e371927c290170ab6b8ac2597e5ff9.tar.gz | |
Harmonize Unix Makefile template with Windows dito
The variable SHARED_CFLAGS and SHARD_LDFLAGS were used in the Unix
template because they normally contain options used when building
"shared". The Windows template, on the other hand, uses LIB_CFLAGS,
to express the intended use of those flags rather than their content.
The Windows template still used SHARED_LDFLAGS, which seems
inconsistent.
To harmonize the two, any SHARED_CFLAGS gets renamed to LIB_CFLAGS and
SHARED_LDFLAGS to LIB_LDFLAGS. That makes the intent consistent along
with BIN_{C,LD}FLAGS and DSO_{C,LD}FLAGS.
Finally, make sure to pass down $(LIB_CFLAGS) or $(DSO_CFLAGS) along
with $(CFLAGS) when using Makefile.shared.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 2871283a6a..cb1b4e696d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -96,7 +96,7 @@ LDFLAGS={- $target{lflags} -} LDOUTFLAG={- $target{loutflag} || "/out:" -} EX_LIBS={- $target{ex_libs} -} LIB_CFLAGS={- join(" ", $target{lib_cflags}, $target{shared_cflag}) || "" -} -SHARED_LDFLAGS={- $target{shared_ldflag} || "" -} +LIB_LDFLAGS={- $target{shared_ldflag} || "" -} DSO_CFLAGS={- join(" ", $target{dso_cflags}, $target{shared_cflag}) || "" -} DSO_LDFLAGS={- join(" ", $target{dso_lflags}, $target{shared_ldflag}) || "" -} BIN_CFLAGS={- $target{bin_cflags} -} @@ -284,7 +284,7 @@ EOF return <<"EOF" $target: $deps $ordinalsfile \$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def - \$(LD) \$(LDFLAGS) \$(SHARED_LDFLAGS) \\ + \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ /implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< $objs$linklibs \$(EX_LIBS) << |