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

Minimise the amount of -L. when linking the shared libraries. It 

seems like some Unixen (SCO) have opinions about too many -L.
parent 9f56705f

Makefile.org

+7 −7
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a 
	fi

libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a

	@if [ "$(SHLIB_TARGET)" != "" ]; then \

		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-L. -lcrypto' build-shared; \

		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \

	else \

		echo "There's no support for shared libraries on this platform" >&2; \

	fi
@@ -252,30 +252,30 @@ build-shared: clean-shared do_$(SHLIB_TARGET) link-shared 


do_bsd-gcc-shared: linux-shared

do_linux-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; ${CC}  -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \

		-Wl,--whole-archive lib$$i.a \

		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \

	libs="$$libs -L. -l$$i"; \

	libs="$$libs -l$$i"; \

	done



# This assumes that GNU utilities are *not* used

do_true64-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; ${CC}  -shared -no_archive -o lib$$i.so \

		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

		-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

	libs="$$libs -L. -l$$i"; \

	libs="$$libs -l$$i"; \

	done



# This assumes that GNU utilities are *not* used

do_solaris-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-h lib$$i.so.${SHLIB_MAJOR} \

		-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \

	libs="$$libs -L. -l$$i"; \

	libs="$$libs -l$$i"; \

	done



Makefile.ssl: Makefile.org