[Libreoffice-commits] .: 2 commits - .gitignore solenv/gbuild

[Tor Lillqvist]

 .gitignore                         |    2 +-
 solenv/gbuild/platform/ios.mk      |    2 +-
 solenv/gbuild/platform/macosx.mk   |    2 +-
 solenv/gbuild/platform/solaris.mk  |    2 +-
 solenv/gbuild/platform/unxgcc.mk   |    2 +-
 solenv/gbuild/platform/winmingw.mk |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 79699cd0b0904eb713bd7115b27b84a341043d26
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jul 26 12:23:48 2011 +0300

    Redirect stderr of the ar command to /dev/null only if we are silent

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index c2b8d31..86cff72 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -255,7 +255,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		2> /dev/null)
+		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 
 define gb_LinkTarget__command
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a14720a..fd3c6ab 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -320,7 +320,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		2> /dev/null)
+		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 
 define gb_LinkTarget__command
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index c52cfa9..aa351ad 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -228,7 +228,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		2> /dev/null)
+		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 
 define gb_LinkTarget__command
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4d6b0d2..9210c93 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -276,7 +276,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		2> /dev/null)
+		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 
 define gb_LinkTarget__command
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 0435f51..fee27f9 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -420,7 +420,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		2> /dev/null)
+		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 
 define gb_LinkTarget__command
commit cfc294c3474656d5a28c617bacd48b615af5269d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jul 26 12:06:33 2011 +0300

    Add Env.Host.sh, drop the old *.Set.sh

diff --git a/.gitignore b/.gitignore
index 575eb3c..a1b1db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,8 +61,8 @@
 /post_download.log
 /install
 /downloaded
-/*.Set.sh
 /Env.Build.sh
+/Env.Host.sh
 /ID
 /tags
 /docs