generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add SHARED_RCFLAGS in unified Makefile template

Browse Source 
Also remove a spurious extra $(LDFLAGS)

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-02-13 15:50:59 +01:00
parent 1b3cddff2b
commit af093bf485
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Configurations/unix-Makefile.tmpl
View File

@@ -112,6 +112,7 @@ SHARED_LDFLAGS={- $target{shared_ldflag}
# $prefix is not /usr. # $prefix is not /usr.
. ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$|
? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -}
SHARED_RCFLAGS={- $target{shared_rcflag} -}
PERL={- $config{perl} -} PERL={- $config{perl} -}
@@ -790,6 +791,7 @@ $shlibtarget : $lib\$(LIB_EXT) $deps $ordinalsfile
CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\ CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\
CROSS_COMPILE="\$(CROSS_COMPILE)" \\ CROSS_COMPILE="\$(CROSS_COMPILE)" \\
SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=\$(SHLIB_EXT) \\ SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=\$(SHLIB_EXT) \\
SHARED_RCFLAGS="\$(SHARED_RCFLAGS)" \\
link_a.$shlib_target link_a.$shlib_target
EOF EOF
. (windowsdll() ? <<"EOF" : ""); . (windowsdll() ? <<"EOF" : "");
@@ -855,7 +857,7 @@ $bin\$(EXE_EXT) : $objs $deps
\$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\
APPNAME=$bin OBJECTS="$objs" \\ APPNAME=$bin OBJECTS="$objs" \\
LIBDEPS="\$(PLIB_LDFLAGS) \$(LDFLAGS) $linklibs \$(EX_LIBS)" \\ LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\
CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\ CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\
LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\ LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\
link_app.$shlib_target link_app.$shlib_target