diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
| commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
| tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /RepositoryExternal.mk | |
| parent | 09e9274fc080b471393b806617eb03124db67590 (diff) | |
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 24f3975aa2d5..3871080d2530 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -720,32 +720,13 @@ endif # SYSTEM_CMIS ifeq ($(ENABLE_JAVA),TRUE) -ifeq ($(OS)$(COM),WNTGCC) - define gb_LinkTarget__use_jawt -$(call gb_LinkTarget_use_custom_headers,$(1),external/jawt) - -$(call gb_LinkTarget_add_ldflags,$(1),\ - -L$(call gb_CustomTarget_get_workdir,external/jawt) \ -) - $(call gb_LinkTarget_add_libs,$(1),\ $(JAWTLIB) \ ) endef -else # $(OS)$(COM) != WNTGCC - -define gb_LinkTarget__use_jawt -$(call gb_LinkTarget_add_libs,$(1),\ - $(JAWTLIB) \ -) - -endef - -endif # $(OS)$(COM) = WNTGCC - else # !ENABLE_JAVA gb_LinkTarget__use_jawt := @@ -2986,7 +2967,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ ) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_LinkTarget_use_external,$(1),openssl) $(call gb_LinkTarget_use_system_win32_libs,$(1),\ |