From d4386896d64bb594f5b9f834a5d25e5bad45f3a6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 5 Oct 2021 17:32:15 -0700
Subject: [PATCH] Fix "Installing from source" instructions

Fixes #6387
---
 README.md      | 5 +++--
 tools/bazel.mk | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index aa8b8c068..3d380350f 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,9 @@ Make sure the following dependencies are installed:
 Build and install the `runsc` binary:
 
 ```sh
-make runsc
-sudo cp ./bazel-bin/runsc/linux_amd64_pure_stripped/runsc /usr/local/bin
+mkdir -p bin
+make copy TARGETS=runsc DESTINATION=bin/
+sudo cp ./bin/runsc /usr/local/bin
 ```
 
 ### Testing
diff --git a/tools/bazel.mk b/tools/bazel.mk
index 1444423e4..68b804ec4 100644
--- a/tools/bazel.mk
+++ b/tools/bazel.mk
@@ -186,8 +186,8 @@ build_paths = \
   (set -euo pipefail; \
   $(call wrapper,$(BAZEL) build $(BASE_OPTIONS) $(BAZEL_OPTIONS) $(1)) && \
   $(call wrapper,$(BAZEL) cquery $(BASE_OPTIONS) $(BAZEL_OPTIONS) $(1) --output=starlark --starlark:file=tools/show_paths.bzl) \
-  | xargs -r -n 1 -I {} bash -c 'test -e "{}" || exit 0; readlink -f "{}"' \
-  | xargs -r -n 1 -I {} bash -c 'set -euo pipefail; $(2)')
+  | xargs -r -I {} bash -c 'test -e "{}" || exit 0; readlink -f "{}"' \
+  | xargs -r -I {} bash -c 'set -euo pipefail; $(2)')
 
 clean = $(call header,CLEAN) && $(call wrapper,$(BAZEL) clean)
 build = $(call header,BUILD $(1)) && $(call build_paths,$(1),echo {})