diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-01-06 21:28:17 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-07 14:34:52 +0000 |
commit | c173aba39c3e49f4c9b8f85d0c2ce08664a38f0f (patch) | |
tree | c06456bcf591b6c1dbbacd3a2c9a3923d62af773 /Makefile.in | |
parent | dcae0a5dba5aadc1e89828518102947f749db10e (diff) |
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 <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit e9cd5087366f930efd89a95c0a5610fe8f375581)
Reviewed-on: https://gerrit.libreoffice.org/21205
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 2a4748eb7270..98037064b45b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,7 +185,7 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/ios/lo.xcconfig \ $(BUILDDIR)/lo.xcent \ $(BUILDDIR)/sysui/desktop/macosx/Info.plist - find $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \; + $(FIND) $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \; # # custom command |