external/firebird/ExternalProject_firebird.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f58f10fc89e19d182b5a415bb69af5ecc7de080a
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 27 23:52:44 2015 +0200
firebird: --enable-debug breaks the build with MSVC
With the 2.5.4 upgrade somehow this fails to link fbintl.lib with
unresolved symbols.
Debugging is overrated anyway, let's just disable that for now.
Change-Id: I265c705c10ca7c70baa18232f6f740120d6b397e
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index f1dbb2f..f24d0f7 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample
--without-fbsample-db \
- $(if $(ENABLE_DEBUG),--enable-debug) \
+ $(if $(filter-out MSC,$(COM)),$(if
$(ENABLE_DEBUG),--enable-debug)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
