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 /external/expat | |
| parent | Optimize Excel GetOrCreateRow: reduce loops (diff) | |
| download | core-8646ab97dc37c0606b19057686bf3d610f9c15ee.tar.gz core-8646ab97dc37c0606b19057686bf3d610f9c15ee.zip | |
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 'external/expat')
| -rw-r--r-- | external/expat/Module_expat.mk | 9 | ||||
| -rw-r--r-- | external/expat/StaticLibrary_expat.mk | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/external/expat/Module_expat.mk b/external/expat/Module_expat.mk index ab39cdaf8dc5..baac0b595e20 100644 --- a/external/expat/Module_expat.mk +++ b/external/expat/Module_expat.mk @@ -14,14 +14,7 @@ $(eval $(call gb_Module_add_targets,expat,\ StaticLibrary_expat \ )) -# Actually it wasn't that clear if we should -# run configure step on mingw or not: -# CONFIGURATION_ACTION wasn't set, but -# CROSS_COMPILE case was handled in original makefile - -# tested it on mingw and it doesn't hurt ;-) -#ifneq ($(OS),WNT) -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,expat,\ ExternalProject_expat \ )) diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 4d6957f9ef52..bdcc767e2905 100644 --- a/external/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk @@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat)) $(eval $(call gb_StaticLibrary_use_unpacked,expat,expat)) # no configure step on windows, no dependency -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full)) endif |