firebird/ExternalProject_firebird.mk | 5 ++++-
solenv/gbuild/platform/com_MSC_defs.mk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f6fcc5b79ca72e0145b1798bbfa3d686bdf07042
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Aug 29 20:22:55 2013 +0300
Set PATH for running the Cygwin Make
Our normal gb_Helper_set_path sets PATH in Windows syntax, which is
fine when running out own build-time tools (which obviously are not
Cygwin programs), but not when running the Cygwin Make.
Change-Id: I5563e2f5a01beb05db56792dfd56116832d2ec36
diff --git a/firebird/ExternalProject_firebird.mk
b/firebird/ExternalProject_firebird.mk
index 296848e..bf6b453 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -46,7 +46,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--with-system-icu --without-fbsample
--without-fbsample-db \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter IOS
ANDROID,$(OS)),--disable-shared,--disable-static) \
- && $(gb_Helper_set_ld_path) $(MAKE) firebird_embedded \
+ && $(if $(filter WNT,$(OS)),\
+ PATH="$(shell cygpath -u $(OUTDIR)/bin):$$PATH",\
+ $(gb_Helper_set_ld_path)) \
+ $(MAKE) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
commit 8dd3de6e73db87e9742d1179408e57746299cb4f
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Aug 29 20:06:39 2013 +0300
Revert "Fix MSC build of firebird"
Better (?) fix coming.
This reverts commit 9831afe569490b09143a1f98263ee7d0e1faa323.
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index ac68d36..81f20da 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -266,6 +266,6 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
# need windows path with backslashes here
-gb_Helper_set_ld_path := PATH="$(shell cygpath -w
$(OUTDIR)/bin)"$${PATH:+:$$PATH}
+gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(OUTDIR)/bin)"
# vim: set noet sw=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
