summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevitte <levitte>2003-04-09 06:49:01 +0000
committerlevitte <levitte>2003-04-09 06:49:01 +0000
commit5923a1a87057effbc619c176eafcf18e59047c2d (patch)
tree4cd88d445bb40015fd084509f5ce069f5083f401
parentc2dca045ef6e1367e134a47dfefff96fe15934cd (diff)
downloadopenssl-5923a1a87057effbc619c176eafcf18e59047c2d.tar.gz
Make the same changes for svr5 shared library building as in
0.9.7-stable.
-rw-r--r--Makefile.org7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org
index cdf2d1b69..a0b883782 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -370,7 +370,8 @@ do_svr3-shared:
for obj in `ar t lib$$i.a` ; do \
OBJS="$${OBJS} `grep $$obj allobjs`" ; \
done ; \
- set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ set -x; ${CC} ${SHARED_LDFLAGS} \
+ -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
libs="$$libs -l$$i"; \
@@ -384,13 +385,15 @@ do_svr5-shared:
else \
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
+ SHARE_FLAG='-G'; \
+ (${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} \
- -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
libs="$$libs -l$$i"; \