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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/GeneratedPackage.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 751e3296fb93..255295607fcf 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -33,7 +33,7 @@ $(call gb_Helper_abbreviate_dirs,\ rm -rf $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) && \ $(foreach pair,$(PACKAGE_DIRS),\ $(call gb_GeneratedPackage__command_cp,$(call gb_GeneratedPackage__get_srcdir,$(pair)),$(call gb_GeneratedPackage__get_destdir,$(pair))) &&) \ - find \ + $(FIND) \ $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \ \( -type f -o -type l \) -print \ > $(1) \ diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index c57492d9a822..468b80b4940a 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -202,7 +202,7 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \ $(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \ - && find $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" > $(dir $@)/LIST \ + && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" > $(dir $@)/LIST \ && touch $@) # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined] diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index b7c1e6537184..099c5d385fbe 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -224,7 +224,7 @@ gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/Unpack # Mac OS X sort(1) cannot read a response file define gb_UIConfig__command $(call gb_Helper_abbreviate_dirs,\ - sort -u $(UI_IMAGELISTS) /dev/null > $@ \ + $(SORT) -u $(UI_IMAGELISTS) /dev/null > $@ \ ) endef 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 \ ) |