summaryrefslogtreecommitdiffstats
path: root/external/firebird
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-10 14:05:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-10 18:01:27 +0000
commit8646ab97dc37c0606b19057686bf3d610f9c15ee (patch)
tree17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /external/firebird
parentOptimize Excel GetOrCreateRow: reduce loops (diff)
downloadcore-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/firebird')
-rw-r--r--external/firebird/ExternalPackage_firebird.mk2
-rw-r--r--external/firebird/UnpackedTarball_firebird.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index 6505eda1064f..87df3567e932 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird))
$(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
-ifeq ($(OS)-$(COM),WNT-MSC)
+ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.dll))
$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll))
else ifeq ($(OS),MACOSX)
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index e30048d4e69b..3cd7a42a0772 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \
))
-ifeq ($(OS)-$(COM),WNT-MSC)
+ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch \
))