Cygwin/mingw sync with stable.
authorAndy Polyakov <appro@openssl.org>
Sat, 30 Apr 2005 23:45:53 +0000 (23:45 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 30 Apr 2005 23:45:53 +0000 (23:45 +0000)
Makefile.org
Makefile.shared

index a6f59dd..daed671 100644 (file)
@@ -501,7 +501,7 @@ install_docs:
        @pod2man="`cd util; ./pod2mantest $(PERL)`"; \
        here="`pwd`"; \
        filecase=; \
-       if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \
+       if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
                filecase=-i; \
        fi; \
        set -e; for i in doc/apps/*.pod; do \
index afa421f..4f90970 100644 (file)
@@ -260,9 +260,14 @@ link_a.cygwin:
        SHLIB_SOVER=; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+       base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x61200000; \
+       SHAREDFLAGS="$(CFLAGS) $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
-       $(LINK_SO_A)
+       [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
+       [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
+       $(LINK_SO_A) || exit 1; \
+       cp -p $$SHLIB$$SHLIB_SUFFIX apps/; \
+       cp -p $$SHLIB$$SHLIB_SUFFIX test/
 link_app.cygwin:
        LDCMD=$(CC);\
        LDFLAGS="$(CFLAGS)"; \