Commit bbd9a50f authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 8cab4e9b

Configurations/unix-Makefile.tmpl

+26 −25
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} 
LDFLAGS= {- $target{lflags} -}

PLIB_LDFLAGS= {- $target{plib_lflags} -}

EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -}

SHARED_CFLAGS={- $target{shared_cflag} || "" -}

SHARED_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag}

LIB_CFLAGS={- $target{shared_cflag} || "" -}

LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag}

               # Unlike other OSes (like Solaris, Linux, Tru64,

               # IRIX) BSD run-time linkers (tested OpenBSD, NetBSD

               # and FreeBSD) "demand" RPATH set on .so objects.
@@ -166,8 +166,9 @@ SHARED_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} 
               # $prefix is not /usr.

               . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$|

                  ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -}

SHARED_RCFLAGS={- $target{shared_rcflag} -}

RCFLAGS={- $target{shared_rcflag} -}

DSO_CFLAGS={- $target{shared_cflag} || "" -}

DSO_LDFLAGS=$(LIB_LDFLAGS)

BIN_CFLAGS={- "" -}



PERL={- $config{perl} -}
@@ -878,7 +879,7 @@ EOF 
      my $srcs = join(" ",  @srcs);

      my $deps = join(" ", @srcs, @{$args{deps}});

      my $incs = join("", map { " -I".$_ } @{$args{incs}});

      my $ecflags = { lib => '$(SHARED_CFLAGS)',

      my $ecflags = { lib => '$(LIB_CFLAGS)',

                      dso => '$(DSO_CFLAGS)',

                      bin => '$(BIN_CFLAGS)' } -> {$args{intent}};

      my $makedepprog = $config{makedepprog};
@@ -954,10 +955,10 @@ $target: $lib$libext $deps $ordinalsfile 
		LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\

		LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\

		LIBCOMPATVERSIONS=";\$(SHLIB_VERSION_HISTORY)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\

		CROSS_COMPILE="\$(CROSS_COMPILE)" \\

		SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=$shlibext \\

		SHARED_RCFLAGS="\$(SHARED_RCFLAGS)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(LIB_CFLAGS)" \\

		CROSS_COMPILE="\$(CROSS_COMPILE)" LDFLAGS="\$(LDFLAGS)" \\

		SHARED_LDFLAGS="\$(LIB_LDFLAGS)" SHLIB_EXT=$shlibext \\

		SHARED_RCFLAGS="\$(RCFLAGS)" \\

		link_shlib.$shlib_target

EOF

	  . (windowsdll() ? <<"EOF" : "");
@@ -988,8 +989,8 @@ $target: $objs $deps 
		PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\

		LIBDEPS="\$(PLIB_LDFLAGS) $shlibdeps \$(EX_LIBS)" \\

		LIBNAME=$libname LDFLAGS="\$(LDFLAGS)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS)" \\

		SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(DSO_CFLAGS)" \\

		SHARED_LDFLAGS="\$(DSO_LDFLAGS)" \\

		SHLIB_EXT=$dsoext \\

		LIBEXTRAS="$objs" \\

		link_dso.$shlib_target
@@ -1025,8 +1026,8 @@ $bin$exeext: $objs $deps 
		PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\

		APPNAME=$bin$exeext OBJECTS="$objs" \\

		LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\

		LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\

		CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(BIN_CFLAGS)" \\

		LDFLAGS="\$(LDFLAGS)" LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\

		link_app.$shlib_target

EOF

  }

Configurations/windows-makefile.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -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)

<<