Commit affaea59 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

cygwin shared rules update [from HEAD]. 

PR: 1517
parent 81fc4c93

Makefile.shared

+10 −4
Original line number Diff line number Diff line
@@ -236,24 +236,30 @@ link_o.cygwin: 
	@ $(CALC_VERSIONS); \

	INHIBIT_SYMLINKS=yes; \

	SHLIB=cyg$(LIBNAME); \

	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \

	base=-Wl,--enable-auto-image-base; \

	if expr $(PLATFORM) : 'mingw' > /dev/null; then \

		SHLIB=$(LIBNAME)eay32; base=; \

	fi; \

	SHLIB_SUFFIX=.dll; \

	LIBVERSION="$(LIBVERSION)"; \

	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \

	$(LINK_SO_O)

link_a.cygwin:

	@ $(CALC_VERSIONS); \

	INHIBIT_SYMLINKS=yes; \

	SHLIB=cyg$(LIBNAME); \

	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \

	base=-Wl,--enable-auto-image-base; \

	if expr $(PLATFORM) : 'mingw' > /dev/null; then \

		SHLIB=$(LIBNAME)eay32; \

		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \

	fi; \

	SHLIB_SUFFIX=.dll; \

	SHLIB_SOVER=-$(LIBVERSION); \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \

	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \

	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \