solenv/gbuild/platform/com_MSC_defs.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 18258eb811d1b8ad10810925952b8e32228128c5
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 11 21:54:03 2014 +0200
gbuild: always prepend our stuff to PATH on Windows
Who knows what weird conflicting stuff could be on PATH.
Change-Id: I5acec89687efe736ecc1f970eb56efa22393b251
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index f5dc496..eaae642 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -295,14 +295,14 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
# Helper class
ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_Helper_set_ld_path := PATH="$$PATH;$(shell cygpath -w
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w
$(INSTDIR)/$(LIBO_BIN_FOLDER))"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -w
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w
$(INSTDIR)/$(LIBO_BIN_FOLDER));$$PATH"
define gb_Helper_prepend_ld_path
PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w
$(INSTDIR)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
endef
else
-gb_Helper_set_ld_path := PATH="$$PATH:$(shell cygpath -u
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u
$(INSTDIR)/$(LIBO_BIN_FOLDER))"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -u
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u
$(INSTDIR)/$(LIBO_BIN_FOLDER)):$$PATH"
define gb_Helper_prepend_ld_path
PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u
$(INSTDIR)/$(LIBO_BIN_FOLDER)):$(1):$$PATH"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
