提交 94c1672e 编写于 作者: A Andy Polyakov

Cygwin/mingw sync with stable.

上级 405d9761
...@@ -501,7 +501,7 @@ install_docs: ...@@ -501,7 +501,7 @@ install_docs:
@pod2man="`cd util; ./pod2mantest $(PERL)`"; \ @pod2man="`cd util; ./pod2mantest $(PERL)`"; \
here="`pwd`"; \ here="`pwd`"; \
filecase=; \ filecase=; \
if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \ if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
filecase=-i; \ filecase=-i; \
fi; \ fi; \
set -e; for i in doc/apps/*.pod; do \ set -e; for i in doc/apps/*.pod; do \
......
...@@ -260,9 +260,14 @@ link_a.cygwin: ...@@ -260,9 +260,14 @@ link_a.cygwin:
SHLIB_SOVER=; \ SHLIB_SOVER=; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-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}'; \ 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: link_app.cygwin:
LDCMD=$(CC);\ LDCMD=$(CC);\
LDFLAGS="$(CFLAGS)"; \ LDFLAGS="$(CFLAGS)"; \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册