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 /odk | |
| 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 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 3 | ||||
| -rw-r--r-- | odk/util/check.pl | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 8328fc8a4b0b..dc983e2f67d8 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -13,8 +13,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/check,\ checkbin \ )) -odk_PLATFORM := $(if $(filter WNT,$(OS)),\ - $(if $(filter GCC,$(COM)),mingw,windows),\ +odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\ $(if $(filter SOLARIS,$(OS)),\ $(if $(filter SPARC,$(CPUNAME)),solsparc,\ $(if $(filter SPARC64,$(CPUNAME)),solsparc64,solintel)),\ diff --git a/odk/util/check.pl b/odk/util/check.pl index 8dfbfcc6ba56..03b58fe3da7c 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -62,8 +62,8 @@ if (-d "$SdkDir") { } } - if ($OperatingSystem eq "windows" || $OperatingSystem eq "mingw") { - if ($OperatingSystem eq "windows" && !check_file("bin/climaker.exe")) { + if ($OperatingSystem eq "windows") { + if (!check_file("bin/climaker.exe")) { $return++; print "\nERROR: \"bin/climaker.exe\" is missing\n"; } else { @@ -110,7 +110,7 @@ if (-d "$SdkDir") { #check configure files print "check config files: "; - if ($OperatingSystem eq "windows" || $OperatingSystem eq "mingw") { + if ($OperatingSystem eq "windows") { if (!check_file("setsdkenv_windows.bat")) { print "\nERROR: \"setsdkenv_windows.bat\" is missing\n"; $return++; |