summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-26 12:23:48 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-26 12:23:48 +0300
commit7e706639f8e86e882b7166cd8976a1d25b2152d7 (patch)
tree527480384ced25e513e21e4a51c0ddf6a6c4ab40 /solenv
parentc8144f0de40efe966fab52115931b4f3d41196ae (diff)
Redirect stderr of the ar command to /dev/null only if we are silent
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/ios.mk2
-rw-r--r--solenv/gbuild/platform/macosx.mk2
-rw-r--r--solenv/gbuild/platform/solaris.mk2
-rw-r--r--solenv/gbuild/platform/unxgcc.mk2
-rw-r--r--solenv/gbuild/platform/winmingw.mk2
5 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index c2b8d31de5b8..86cff729962e 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 a14720a9950f..fd3c6ab5484c 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 c52cfa960478..aa351ad16baf 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 4d6b0d2026f6..9210c937e509 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 0435f512789f..fee27f929c33 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