diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-02-03 22:40:40 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-02-03 22:40:40 +0000 |
| commit | 485e30dbe195beed5d98497e87bbb99eecbb4551 (patch) | |
| tree | 052264bb4bdba3d97465fbadab555da46af4433e /Makefile.shared | |
| parent | 877dbcb8a0463596f9e51c34f8e59fbfb6e3bc8e (diff) | |
| download | openssl-new-485e30dbe195beed5d98497e87bbb99eecbb4551.tar.gz | |
Drop redundant -lc from a number of rules in Makefile.shared. It's
perfectly safe [compiler driver adds it] and in some situation even
perfectly appropriate [mixing -pthread and -lc on FreeBSD can have
lethal effect on apps/openssl]. I'd say we should get rid of more,
but I remove those I can test myself...
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.shared b/Makefile.shared index 313dd5e7eb..8b37a36e47 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -138,14 +138,14 @@ DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null DO_GNU_SO=$(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ SHAREDFLAGS="$(CFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ SHAREDCMD='$(CC)' DO_GNU_APP=LDCMD=$(CC);\ LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ APPNAME=$(APPNAME) #This is rather special. It's a special target with which one can link @@ -335,7 +335,7 @@ link_o.tru64: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -358,7 +358,7 @@ link_a.tru64: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -381,7 +381,7 @@ link_app.tru64: else \ LDCMD=$(CC);\ LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; \ $(LINK_APP) @@ -394,7 +394,7 @@ link_o.tru64-rpath: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -417,7 +417,7 @@ link_a.tru64-rpath: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -440,7 +440,7 @@ link_app.tru64-rpath: else \ LDCMD=$(CC);\ LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; \ $(LINK_APP) @@ -454,7 +454,7 @@ link_o.solaris: (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ @@ -470,7 +470,7 @@ link_a.solaris: (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=;\ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ @@ -483,7 +483,7 @@ link_app.solaris: else \ LDCMD=$(CC);\ LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; \ $(LINK_APP) @@ -579,7 +579,7 @@ link_o.irix: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ MINUSWL=""; \ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ @@ -595,7 +595,7 @@ link_a.irix: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ MINUSWL=""; \ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ @@ -610,7 +610,7 @@ link_app.irix: else \ LDCMD=$(CC);\ LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ + LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; \ $(LINK_APP) |