]> granicus.if.org Git - openssl/commitdiff
It seems like gcc-drivven shared library building on OpenUnix 8 requires
authorRichard Levitte <levitte@openssl.org>
Tue, 1 Apr 2003 10:59:40 +0000 (10:59 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 1 Apr 2003 10:59:40 +0000 (10:59 +0000)
-shared rather than -G.

Configure
Makefile.org

index ba96f8093af8511b653bb11ba46f49d75c8fcff0..5c8b7367942642c61cfb38a7e6b96d177d1795a0 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -433,7 +433,7 @@ my %table=(
 "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenUNIX-8-gcc","gcc:-O -DFILIO_H -fomit-frame-pointer::-pthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenUNIX-8-gcc","gcc:-O -DFILIO_H -fomit-frame-pointer::-pthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "sco3-gcc",  "gcc:-O3 -fomit-frame-pointer -Dssize_t=int -DNO_SYS_UN_H::(unknown)::-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...
 # SCO 5 - Ben Laurie <ben@algroup.co.uk> says the -O breaks the SCO cc.
 "sco5-cc",  "cc:-belf::(unknown)::-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
index 3acc550243a482ac0497e351b35c498be6611f2d..70496fb9c42617ca36f20841097c4811ea7fbc30 100644 (file)
@@ -407,12 +407,15 @@ 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}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+                 set -x; ${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; \
                libs="-l$$i $$libs"; \
@@ -429,13 +432,15 @@ do_svr5-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} \
-                       -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="-l$$i $$libs"; \