diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-13 15:50:59 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-13 16:03:31 +0100 |
| commit | af093bf4853bdf1a7fee6fc31997457c85a9f559 (patch) | |
| tree | 1539a9a3cefab28b62a4d03d3d61788c068a67a8 /Configurations | |
| parent | 1b3cddff2b61f084e0ebb871a33baec92d4b1d21 (diff) | |
Add SHARED_RCFLAGS in unified Makefile template
Also remove a spurious extra $(LDFLAGS)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index e09d060ef7..4049846a37 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -112,6 +112,7 @@ SHARED_LDFLAGS={- $target{shared_ldflag} # $prefix is not /usr. . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} +SHARED_RCFLAGS={- $target{shared_rcflag} -} PERL={- $config{perl} -} @@ -790,6 +791,7 @@ $shlibtarget : $lib\$(LIB_EXT) $deps $ordinalsfile CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\ CROSS_COMPILE="\$(CROSS_COMPILE)" \\ SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=\$(SHLIB_EXT) \\ + SHARED_RCFLAGS="\$(SHARED_RCFLAGS)" \\ link_a.$shlib_target EOF . (windowsdll() ? <<"EOF" : ""); @@ -855,7 +857,7 @@ $bin\$(EXE_EXT) : $objs $deps \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ APPNAME=$bin OBJECTS="$objs" \\ - LIBDEPS="\$(PLIB_LDFLAGS) \$(LDFLAGS) $linklibs \$(EX_LIBS)" \\ + LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\ CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\ LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\ link_app.$shlib_target |