X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.shared;h=d856180bf134d8ae22249c29857118cc03722e3d;hp=c556129182fe77f6141199c51e2abb810443d2d8;hb=eedb9db9afd531e9dc69a33b73c7e1cd27153b0b;hpb=150a4790cb01d003b2eb9b86c9906efc4353e6d9 diff --git a/Makefile.shared b/Makefile.shared index c556129182..d856180bf1 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -14,6 +14,7 @@ CFLAGS=$(CFLAG) LDFLAGS=$(LDFLAG) SHARED_LDFLAGS=$(SHARED_LDFLAG) +RC=windres # SHARED_RCFLAGS are flags used with windres, i.e. when build for Cygwin # or Mingw. SHARED_RCFLAGS=$(SHARED_RCFLAG) @@ -278,9 +279,9 @@ link_shlib.cygwin: SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \ dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ echo "$(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name |" \ - "$(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o"; \ + "$(RC) $(SHARED_RCFLAGS) -o rc.o"; \ $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \ - $(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o; \ + $(RC) $(SHARED_RCFLAGS) -o rc.o; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,--enable-auto-image-base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a rc.o"; \ @@ -306,9 +307,9 @@ link_shlib.mingw: | sed -e 's|^\(LIBRARY *\)$(LIBNAME)32|\1'"$$dll_name"'|' \ > $(LIBNAME).def; \ echo "$(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name |" \ - "$(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o"; \ + "$(RC) $(SHARED_RCFLAGS) -o rc.o"; \ $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \ - $(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o; \ + $(RC) $(SHARED_RCFLAGS) -o 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 $(LIBNAME).def rc.o"; \