diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-04-08 11:54:32 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-04-08 11:54:32 +0000 |
| commit | 9f81f2374262cbabf18c5eb67b7a36ac34051801 (patch) | |
| tree | c0ef4289411832e480c46dabdb7c63d79ba77a97 /Makefile.org | |
| parent | 0ae4ad9e9ff2ff635ab8bac014414c3b899e77f7 (diff) | |
Set LD_LIBRARY_PATH when linking, since OpenUnix' ld uses it to create
a library search path.
Correct typos.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 70496fb9c4..4d0627bfdd 100644 --- a/Makefile.org +++ b/Makefile.org @@ -407,15 +407,13 @@ do_svr3-shared: libs="$(LIBKRB5) $$libs"; \ fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ - SHARE_FLAG='-G'; \ - (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAGS='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ OBJS="$${OBJS} `grep $$obj allobjs`" ; \ done ; \ set -x; ${CC} ${SHARED_LDFLAGS} \ - $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -433,13 +431,14 @@ do_svr5-shared: fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ SHARE_FLAG='-G'; \ - (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAGS='-shared'; \ + (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ OBJS="$${OBJS} `grep $$obj allobjs`" ; \ done ; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ + set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ + ${CC} ${SHARED_LDFLAGS} \ $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ |