diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-03-15 22:10:07 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-03-15 22:10:07 +0000 |
| commit | 5ddcb8664a5940ac97a78d8ab870f6118f428f9a (patch) | |
| tree | ddbd64da0a0ca87a0116d6438c4cf0ddf8263565 /Makefile.org | |
| parent | 09c4b4e0b7c795daa99aeca27f83fcac007db33d (diff) | |
Minimise the amount of -L. when linking the shared libraries. It
seems like some Unixen (SCO) have opinions about too many -L.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.org b/Makefile.org index 0d451d1680..ba001fab88 100644 --- a/Makefile.org +++ b/Makefile.org @@ -228,7 +228,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 @@ -260,39 +260,39 @@ 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}.${SHLIB_MINOR} \ -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_tru64-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}.${SHLIB_MINOR} \ -z allextract lib$$i.a $$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_irix-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,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -all lib$$i.a $$libs ${EX_LIBS} -lc) || exit 1; \ - libs="$$libs -L. -l$$i"; \ + libs="$$libs -l$$i"; \ done # This assumes that GNU utilities are *not* used |