diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-04 22:21:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-08 10:33:16 +0000 |
| commit | 2768d78391b0892ae1506687cfccdcc9c018077c (patch) | |
| tree | 012d1ed97bf484794bf3f2139029a4c253bb2310 /Makefile.in | |
| parent | 08e3e6c223c266874a4acf3885997ea6426aa9bd (diff) | |
configure, gbuild: remove Cygwin paths from make environment
All environment variables contain native Win32 paths.
This allows building with Win32 make and Cygwin sh.exe,
but Cygwin make cannot build any more with the Win32 entries in PATH.
Requires adding "bash" detection to configure since /usr/bin/env
can't be invoked by Win32 make and it's possible to install cygwin
somewhere else than C:/cygwin.
Change-Id: Ia8f4ee3c91222e8f5919cfbfc452f12ffbfadd40
Reviewed-on: https://gerrit.libreoffice.org/9698
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
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 381e270c4e3c..915e11c977e2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\ $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS)) -SHELL=/usr/bin/env bash +SHELL := @SHELL_BASH@ SRCDIR := @SRC_ROOT@ BUILDDIR := @BUILDDIR@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T) |