diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2019-01-15 19:29:05 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2019-03-31 18:51:13 +0300 |
| commit | acbeffd07339aea56f3157d2dd88d27e7f24d538 (patch) | |
| tree | 7592a79aa68ba76839eeae5af6c4deb6cd21ff97 /support | |
| parent | 9ccfd778e34aa12cf718968381968a46451f6468 (diff) | |
[sdks,mac] Remove dependency on MXE in favor of MinGW
It turns out that homebrew now has a package for the MinGW gcc-based windows
cross compiler which is awesome as it allows us to skip building MXE and use the
latest version of the GCC suite pre-packaged for Mac. This commit removes almost
all traces of MXE (except for `mxe.mk` itself, because I don't know if any bot
or external tool, whatever, use targets in it) and adds the following brew
packages to SDK bot provisioning as well as to the `provision-mxe` target of
Mono SDKs:
* mingw-w64
* xamarin/xamarin-android-windeps/mingw-zlib
The latter package builds a Windows version of zlib using MinGW and it comes
from Xamarin's own homebrew tap at https://github.com/xamarin/homebrew-xamarin-android-windeps/blob/f4cc90845ff1953800d8d71035566a12d9b7aa24/mingw-zlib.rb
Additionally, this commit adds a new `configure` flag: `--with-static-zlib=PATH`
which allows one to specify the static zlib archive to use when linking Mono.
The static archive supersedes the otherwise indicated or detected zlib. This is
the recommended mode of operation for MinGW builds as it avoids problems with
`zlib.dll` versions on the target machine.
Diffstat (limited to 'support')
| -rw-r--r-- | support/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/support/Makefile.am b/support/Makefile.am index 4813c345a55..21be92398d3 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -99,6 +99,10 @@ ZLIB_SOURCES = \ zlib.h \ zutil.h +if HAVE_STATIC_ZLIB +Z_SOURCE = zlib-helper.c +Z_LIBS = $(STATIC_ZLIB_PATH) +else if HAVE_ZLIB Z_SOURCE = zlib-helper.c Z_LIBS= -lz @@ -106,6 +110,7 @@ else Z_SOURCE = zlib-helper.c $(ZLIB_SOURCES) Z_LIBS= endif +endif libMonoPosixHelper_la_SOURCES = \ $(MPH_SOURCE) \ |