diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:49:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:54:59 +0300 |
| commit | eefc25d1d2eccf04571b8204663d91e61cb5f7f0 (patch) | |
| tree | d6fe0ed9445a4e059e831742d91f8115fab8663b /openssl | |
| parent | 933d898b10f0c71fedc882ac2f2adb258d8b5994 (diff) | |
Bin USE_MINGW
Its alternative values as used by OOo is irrelevant to us as we don't
intend to support building using MinGW on Windows itself. To us, MinGW
always means cross-compilation. For us it is enough to look at
$(OS)$(COM), and WNTGCC always implies cross-compilation.
(OOo on the other hand attempts to support use of the Cygwin gcc with
the -mno-cygwin option (which is practically considered an obsolete
option), the normal MinGW compiler (but still from Cygwin), but not
cros-compilation.)
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/makefile.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index b8f0ec518f53..f537838682e9 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -128,7 +128,6 @@ UNAME=$(shell uname) .IF "$(COM)"=="GCC" PATCH_FILES=opensslmingw.patch -.IF "$(USE_MINGW)" == "cygwin" CONFIGURE_ACTION=$(PERL) configure CONFIGURE_FLAGS=mingw shared INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a @@ -139,16 +138,6 @@ OUT2LIB += libssl.* OUT2BIN = ssleay32.dll OUT2BIN += libeay32.dll .ELSE -CONFIGURE_ACTION= -BUILD_ACTION=cmd /c "ms\mingw32" -OUT2LIB = out/libcrypto_static.* -OUT2LIB += out/libssl_static.* -OUT2LIB += out/libcrypto.* -OUT2LIB += out/libssl.* -OUT2BIN = out/ssleay32.dll -OUT2BIN += out/libeay32.dll -.ENDIF -.ELSE PATCH_FILES=openssl.patch .IF "$(MAKETARGETS)" == "" |