summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2019-09-22 10:30:37 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-02 07:18:09 +0000
commitc9610eabf3c0f637c75ecbc26a5c17bf378db1bf (patch)
tree54648d67089e9957ae7c186b63e7728b2677215d /Makefile.rules
parent39f6cfa3f28e2a888cf7fd4aa77865db680ac28a (diff)
downloadchrome-ec-c9610eabf3c0f637c75ecbc26a5c17bf378db1bf.tar.gz
Fix non-tty output of make print-boards
dash does not support &> so non-tty output on ubuntu was broken. Signed-off-by: Stefan Reinauer <reinauer@chromium.org> BRANCH=none BUG=none TEST=make print-boards TEST=make print-boards | cat Change-Id: If27c55ecfcaac30b24205aef5e1fd67f8a73aae0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1817947 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Commit-Queue: Stefan Reinauer <reinauer@google.com> Tested-by: Stefan Reinauer <reinauer@google.com>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 6195d70bd9..df8c047afd 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -151,10 +151,10 @@ targ_if_prog = $(if $(shell which $(1) 2>/dev/null),$(2),)
# If outputing to tty and column command exists, pipe into column.
# Otherwise, print in newline format.
cmd_pretty_print_list = @echo $(1) \
- | tr ' ' '\n' \
- | { [ -t 1 ] \
- && which column &>/dev/null \
- && column || cat ; } \
+ | tr ' ' '\n' \
+ | { [ -t 1 ] \
+ && which column 1>/dev/null 2>&1 \
+ && column || cat ; }
# By default, the "build_boards" and "try_build_boards" targets will build all
# of the boards listed in $(boards). However, the invoker can provide a