diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-06 21:28:17 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-07 08:44:28 +0000 |
| commit | e9cd5087366f930efd89a95c0a5610fe8f375581 (patch) | |
| tree | 77e83e7d88a8f6cf4a485b5f70686588661bc7a8 /config_host.mk.in | |
| parent | 2e11a3e03ed37eb86cd87f68191c48d2a6e442cb (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>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 9b59af3f6014..06ea207884be 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -184,7 +184,7 @@ export EPM_FLAGS=@EPM_FLAGS@ export ETONYEK_CFLAGS=$(gb_SPACE)@ETONYEK_CFLAGS@ export ETONYEK_LIBS=$(gb_SPACE)@ETONYEK_LIBS@ export debug=@ENABLE_DEBUG@ -@x_Cygwin@ export FIND=@WIN_FIND@ +export FIND=@FIND@ export FIREBIRD_CFLAGS=$(gb_SPACE)@FIREBIRD_CFLAGS@ export FIREBIRD_LIBS=$(gb_SPACE)@FIREBIRD_LIBS@ export FLEX=@FLEX@ @@ -492,6 +492,7 @@ export SERF_CFLAGS=$(gb_SPACE)@SERF_CFLAGS@ export SERF_LIBS=$(gb_SPACE)@SERF_LIBS@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ export SOLARINC=@SOLARINC@ +export SORT=@SORT@ export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@ export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@ export SRCDIR=@SRC_ROOT@ |