'a=b c=$a; echo $c' doesn't necessarily prints "b", '' vs. "", $s in

[openssl.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index dd7bf8dbc77202725dc1ad9318bd11cd466b3442..c8b0bf690855ce3a5ef9b2790a6ae46553df7525 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -108,13 +108,11 @@ LINK_SO_A_UNPACKED=       \
   SHOBJECTS=$$UNPACKDIR/*.o; \
   $(LINK_SO) && rm -rf $$UNPACKDIR
 
-DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \
-       my_ld=`${CC} -print-prog-name=ld 2>&1` && \
-       [ -n "$$my_ld" ] && \
-       $$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1
+DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+
 DO_GNU=$(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='-Wl,--whole-archive' \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
@@ -137,10 +135,10 @@ link_o.darwin:
        SHAREDFLAGS="-dynamiclib" \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
        $(LINK_SO_O)
 link_a.darwin:
@@ -153,10 +151,10 @@ link_a.darwin:
        SHAREDFLAGS="-dynamiclib" \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
        $(LINK_SO_A)
 
@@ -197,14 +195,14 @@ link_o.alpha-osf1:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -220,14 +218,14 @@ link_a.alpha-osf1:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -246,14 +244,14 @@ link_o.tru64:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared -msym" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -269,14 +267,14 @@ link_a.tru64:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared -msym" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -295,14 +293,14 @@ link_o.tru64-rpath:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -318,14 +316,14 @@ link_a.tru64-rpath:
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
                else \
                        SHLIB_HIST="$(LIBVERSION)"; \
-               fi
+               fi; \
                SHLIB_SOVER= \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='-none' \
                SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)" \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -335,12 +333,14 @@ link_o.solaris:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
+               MINUSZ='-z '; \
+               (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ; \
                LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               ALLSYMSFLAGS="$${MINUSZ}allextract" \
+               NOALLSYMSFLAGS="$${MINUSZ}defaultextract" \
+               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -349,12 +349,14 @@ link_a.solaris:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
+               MINUSZ='-z '; \
+               (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ;\
                LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               ALLSYMSFLAGS="$${MINUSZ}allextract" \
+               NOALLSYMSFLAGS="$${MINUSZ}defaultextract" \
+               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A)
@@ -367,11 +369,11 @@ link_o.svr3:
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ; \
                LIBDEPS="$(LIBDEPS) -lc" \
                ALLSYMSFLAGS='-z allextract' \
                NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -381,11 +383,11 @@ link_a.svr3:
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ; \
                LIBDEPS="$(LIBDEPS) -lc" \
                ALLSYMSFLAGS='-z allextract' \
                NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A_UNPACKED)
@@ -396,11 +398,11 @@ link_o.irix:
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ; \
                LIBDEPS="$(LIBDEPS) -lc" \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -410,11 +412,11 @@ link_a.irix:
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
+               SHLIB_SUFFIX= ; \
                LIBDEPS="$(LIBDEPS) -lc" \
                ALLSYMSFLAGS='-all' \
                NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A)
@@ -432,21 +434,21 @@ link_a.irix:
 link_o.hpux32:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='-Fl' \
        NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux32:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='-Fl' \
        NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 
@@ -461,28 +463,28 @@ link_a.hpux32:
 link_o.hpux64:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='+forceload' \
        NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux64:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='+forceload' \
        NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 
 link_o.aix:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
+       SHLIB_SUFFIX= ; \
        LIBDEPS="$(LIBDEPS) -lc" \
        ALLSYMSFLAGS='-bnogc' \
        NOALLSYMSFLAGS='' \