X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.shared;h=dd7bf8dbc77202725dc1ad9318bd11cd466b3442;hp=83e1bd89d6a0585f738e809db40ba0ee4656d073;hb=406c6f6962529e71076f7270c231bdc9cae8070b;hpb=36757b4438acba4c46046970785c1e9a8f16d798

diff --git a/Makefile.shared b/Makefile.shared
index 83e1bd89d6..dd7bf8dbc7 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -21,7 +21,7 @@ SHARED_LDFLAGS=
 LIBNAME=
 
 # LIBEXTRAS contains extra modules to link together with the library.
-# For example, if a seond library, say libbar.a needs to be linked into
+# For example, if a second library, say libbar.a needs to be linked into
 # libfoo.so, you need to do the following:
 #LIBEXTRAS=libbar.a
 # Note that this MUST be used when using the link_o targets, to hold the
@@ -67,7 +67,7 @@ CALC_VERSIONS=	\
 			SHLIB_SOVER_NODOT=$$v \
 			SHLIB_SOVER=.$$v; \
 			if [ -n "$$prev" ]; then \
-				SHLIB_COMPAT=$$SHLIB_COMPAT .$$prev; \
+				SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
 			fi; \
 			prev=$$v; \
 		done; \
@@ -80,17 +80,19 @@ LINK_SO=	\
 	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
   $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
 SYMLINK_SO=	\
-	prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
-	if [ -n "$$SHLIB_COMPAT"]; then \
-		for x in $$SHLIB_COMPAT; do \
-			( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
-			  ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
-			prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
-		done; \
-	fi; \
-	if [ -n "$$SHLIB_SOVER" ]; then \
-		( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
-		  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+	if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
+		prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+		if [ -n "$$SHLIB_COMPAT" ]; then \
+			for x in $$SHLIB_COMPAT; do \
+				( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
+				  ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
+				prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
+			done; \
+		fi; \
+		if [ -n "$$SHLIB_SOVER" ]; then \
+			( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+		fi; \
 	fi
 
 LINK_SO_A=	SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
@@ -107,36 +109,29 @@ LINK_SO_A_UNPACKED=	\
   $(LINK_SO) && rm -rf $$UNPACKDIR
 
 DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \
-	my_ld=`gcc -print-prog-name=ld 2>&1` && \
+	my_ld=`${CC} -print-prog-name=ld 2>&1` && \
 	[ -n "$$my_ld" ] && \
 	$$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1
-
-link_o.gnu:
-	@ $(CALC_VERSIONS); \
+DO_GNU=$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so \
 	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
-	NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
-	SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
-	SHAREDCMD='$(CC)'; \
-	$(LINK_SO_O)
-link_a.gnu:
-	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME).so \
-	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS='-Wl,--whole-archive' \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
 	SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
-	SHAREDCMD='$(CC)'; \
-	$(LINK_SO_A)
+	SHAREDCMD='$(CC)'
+
+link_o.gnu:
+	@ $(DO_GNU); $(LINK_SO_O)
+link_a.gnu:
+	@ $(DO_GNU); $(LINK_SO_A)
 
 # For Darwin AKA Mac OS/X (dyld)
 link_o.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME) \
 	SHLIB_SUFFIX=.dylib \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS='-all_load' \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS="-dynamiclib" \
@@ -152,7 +147,7 @@ link_a.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME) \
 	SHLIB_SUFFIX=.dylib \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS='-all_load' \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS="-dynamiclib" \
@@ -166,19 +161,23 @@ link_a.darwin:
 	$(LINK_SO_A)
 
 link_o.cygwin:
-	@ SHLIB=cyg$(LIBNAME).dll \
-	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
-	SHLIB_SOVER= \
+	@ $(CALC_VERSIONS); \
+	INHIBIT_SYMLINKS=yes; \
+	SHLIB=cyg$(LIBNAME) \
+	SHLIB_SUFFIX=.dll \
+	LIBDEPS="$(LIBDEPS) -lc" \
+	SHLIB_SOVER=-$(LIBVERSION) \
 	ALLSYMSFLAGS='-Wl,--whole-archive' \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
 	SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a" \
 	SHAREDCMD='${CC}'; \
 	$(LINK_SO_O)
 link_a.cygwin:
-	@ SHLIB=cyg$(LIBNAME).dll \
-	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	@ $(CALC_VERSIONS); \
+	INHIBIT_SYMLINKS=yes; \
+	SHLIB=cyg$(LIBNAME) \
+	SHLIB_SUFFIX=.dll \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	SHLIB_SOVER= \
 	ALLSYMSFLAGS='-Wl,--whole-archive' \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
@@ -188,16 +187,11 @@ link_a.cygwin:
 
 link_o.alpha-osf1:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -212,20 +206,15 @@ link_o.alpha-osf1:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.alpha-osf1:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -240,23 +229,18 @@ link_a.alpha-osf1:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_A); \
-	fi
+	fi; \
+	$(LINK_SO_A)
 
 # The difference between alpha-osf1-shared and tru64-shared is the `-msym'
 # option passed to the linker.
 link_o.tru64:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -271,20 +255,15 @@ link_o.tru64:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.tru64:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -299,23 +278,18 @@ link_a.tru64:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_A); \
-	fi
+	fi; \
+	$(LINK_SO_A)
 
 # The difference between tru64-shared and tru64-shared-rpath is the
 # -rpath ${LIBRPATH} passed to the linker.
 link_o.tru64-rpath:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -330,20 +304,15 @@ link_o.tru64-rpath:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.tru64-rpath:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -358,127 +327,97 @@ link_a.tru64-rpath:
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
 		fi; \
-		$(LINK_SO_A); \
-	fi
+	fi; \
+	$(LINK_SO_A)
 
 link_o.solaris:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-z allextract' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.solaris:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-z allextract' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_A); \
-	fi
+	fi; \
+	$(LINK_SO_A)
 
 # OpenServer 5 native compilers used
 # UnixWare 7 and OpenUNIX 8 native compilers used
 link_o.svr3:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-z allextract' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.svr3:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-z allextract' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_A_UNPACKED); \
-	fi
+	fi; \
+	$(LINK_SO_A_UNPACKED)
 
 link_o.irix:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-all' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_O); \
-	fi
+	fi; \
+	$(LINK_SO_O)
 link_a.irix:
 	@ if ${DETECT_GNU_LD}; then \
-		$(MAKE) -f $(SHARED_MAKEFILE) CC="$(CC)" LDFLAGS="$(LDFLAGS) \
-			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
-			LIBNAME="$(LIBNAME)" LIBEXTRAS="$(LIBEXTRAS)" \
-			LIBVERSION="$(LIBVERSION)"
-			LIBCOMPATVERSIONS="$(LIBCOMPATVERSIONS)" \
-			LIBDEPS="$(LIBDEPS)" link_o.gnu; \
+		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
-		LIBDEPS="$(LIBDEPS)" \
+		LIBDEPS="$(LIBDEPS) -lc" \
 		ALLSYMSFLAGS='-all' \
 		NOALLSYMSFLAGS='' \
 		SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
-		$(LINK_SO_A); \
-	fi
+	fi; \
+	$(LINK_SO_A)
 
 # HP-UX includes the full pathname of libs we depend on, so we would get
 # ./libcrypto (with ./ as path information) compiled into libssl, hence
@@ -544,7 +483,7 @@ link_o.aix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so \
 	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS='-bnogc' \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE' \
@@ -554,7 +493,7 @@ link_a.aix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so \
 	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS='-bnogc' \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE' \
@@ -565,7 +504,7 @@ link_o.reliantunix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so \
 	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS= \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS='-G' \
@@ -575,7 +514,7 @@ link_a.reliantunix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so \
 	SHLIB_SUFFIX= \
-	LIBDEPS="$(LIBDEPS)" \
+	LIBDEPS="$(LIBDEPS) -lc" \
 	ALLSYMSFLAGS= \
 	NOALLSYMSFLAGS='' \
 	SHAREDFLAGS='-G' \
@@ -586,18 +525,19 @@ link_a.reliantunix:
 symlink.gnu symlink.solaris symlink.svr3 symlink.irix \
 symlink.aix symlink.reliantunix:
 	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME).so \
+	SHLIB=lib$(LIBNAME).so; \
 	$(SYMLINK_SO)
 symlink.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME) \
-	SHLIB_SUFFIX=.dylib \
+	SHLIB_SUFFIX=.dylib; \
 	$(SYMLINK_SO)
-symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 symlink.hpux32 symlink.hpux64:
 	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME).sl \
+	SHLIB=lib$(LIBNAME).sl; \
 	$(SYMLINK_SO)
+# The following lines means those specific architectures do no symlinks
+symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 
 # Compatibility targets
 link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu