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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 96a6048a0ba0..63bec8a8f476 100644 --- a/configure.ac +++ b/configure.ac @@ -12826,19 +12826,26 @@ if test "$build_os" = "cygwin"; then if test "$BITNESS_OVERRIDE" = 64; then ATL_LIB="$ATL_LIB/amd64" fi + # sort.exe and find.exe also exist in C:/Windows/system32 so need /usr/bin/ + PathFormat "/usr/bin/find.exe" + FIND="$formatted_path" + PathFormat "/usr/bin/sort.exe" + SORT="$formatted_path" PathFormat "/usr/bin/grep.exe" WIN_GREP="$formatted_path" - PathFormat "/usr/bin/find.exe" - WIN_FIND="$formatted_path" PathFormat "/usr/bin/ls.exe" WIN_LS="$formatted_path" PathFormat "/usr/bin/touch.exe" WIN_TOUCH="$formatted_path" +else + FIND=find + SORT=sort fi AC_SUBST(ATL_INCLUDE) AC_SUBST(ATL_LIB) -AC_SUBST(WIN_FIND) +AC_SUBST(FIND) +AC_SUBST(SORT) AC_SUBST(WIN_GREP) AC_SUBST(WIN_LS) AC_SUBST(WIN_TOUCH) |