From e9cd5087366f930efd89a95c0a5610fe8f375581 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 6 Jan 2016 21:28:17 +0100 Subject: configure: hard-code /usr/bin/{sort,find} for Cygwin ... to avoid calling C:/Windows/system32/{sort,find}.exe, if those happen to be first in PATH. On a Windows 7 system, the other conflicts appear to be harmless, we don't use "more", "expand", "timeout", "whoami". Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57 Reviewed-on: https://gerrit.libreoffice.org/21175 Tested-by: Jenkins Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist --- solenv/gbuild/platform/com_MSC_class.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/gbuild/platform/com_MSC_class.mk') diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2ed964955937..4dbdb903b49f 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -578,7 +578,7 @@ define gb_UIConfig__command $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(if $(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \ && tr " " "\000" < $$RESPONSEFILE | tr -d "\r\n" > $$RESPONSEFILE.0 \ - && sort -u --files0-from=$$RESPONSEFILE.0 > $@ \ + && $(SORT) -u --files0-from=$$RESPONSEFILE.0 > $@ \ && rm $$RESPONSEFILE $$RESPONSEFILE.0 \ ) -- cgit v1.2.3