X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.shared;h=29e180845a503753544c378033e7451d622423c9;hp=af2dc8ce858ea4e47d8d9e0d1fae7e040b43dd1d;hb=64c443e3f0057946ddd8f37a36821a7f9c0e0493;hpb=d7465918867b107058228938e7f5c9fa032ef708 diff --git a/Makefile.shared b/Makefile.shared index af2dc8ce85..29e180845a 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -14,6 +14,10 @@ CFLAGS=$(CFLAG) LDFLAGS=$(LDFLAG) SHARED_LDFLAGS=$(SHARED_LDFLAG) +# SHARED_RCFLAGS are flags used with windres, i.e. when build for Cygwin +# or Mingw. +SHARED_RCFLAGS=$(SHARED_RCFLAG) + NM=nm # LIBNAME contains just the name of the library, without prefix ("lib" @@ -305,17 +309,13 @@ link_a.cygwin: fi; \ dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ $(PERL) util/mkrc.pl $$dll_name | \ - $(CROSS_COMPILE)windres -o rc.o; \ + $(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o; \ extras="$$extras rc.o"; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \ - [ -f apps/$$dll_name ] && rm apps/$$dll_name; \ - [ -f test/$$dll_name ] && rm test/$$dll_name; \ $(LINK_SO_A) || exit 1; \ - rm $$extras; \ - cp -p $$dll_name apps/; \ - cp -p $$dll_name test/ + rm $$extras link_app.cygwin: @if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \ LIBDEPS="$(SRCDIR)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \