Commit f78baa9d authored by Corinna Vinschen's avatar Corinna Vinschen Committed by Richard Levitte
Browse files

Don't strip object files on Cygwin 



  Building for the Cygwin distro requires to be able to build debuginfo
  files.  This in turn requires to build object files without stripping.
  The stripping is performed by the next step after building which creates
  the debuginfo files.

Signed-off-by: default avatarCorinna Vinschen <vinschen@redhat.com>

(cherry picked from commit 42b8f142)

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 5c57fbb8

Makefile.shared

+2 −2
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ link_o.cygwin: 
	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \

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

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

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

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

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

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-s,-Bsymbolic"; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-Bsymbolic"; \

	$(LINK_SO_O)

	$(LINK_SO_O)

#for mingw target if def-file is in use dll-name should match library-name

#for mingw target if def-file is in use dll-name should match library-name

link_a.cygwin:

link_a.cygwin:
@@ -297,7 +297,7 @@ link_a.cygwin: 
	extras="$$extras rc.o"; \

	extras="$$extras rc.o"; \

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

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

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

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

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

	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 apps/$$dll_name ] && rm apps/$$dll_name; \

	[ -f test/$$dll_name ] && rm test/$$dll_name; \

	[ -f test/$$dll_name ] && rm test/$$dll_name; \

	$(LINK_SO_A) || exit 1; \

	$(LINK_SO_A) || exit 1; \