diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-25 02:12:58 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-01-17 09:14:26 +0100 |
| commit | 88204bfa82f982a986d2aa3e166a4c5946040308 (patch) | |
| tree | 7d10a3c76c12f1cdf00ec192cb40efe823a4f0d2 /include | |
| parent | 87d489f67a35968242cd4f192dc363dc87056844 (diff) | |
| download | upstream-88204bfa82f982a986d2aa3e166a4c5946040308.tar.gz upstream-88204bfa82f982a986d2aa3e166a4c5946040308.tar.bz2 upstream-88204bfa82f982a986d2aa3e166a4c5946040308.zip | |
treewide: drop use of which
Ubuntu started to flag which as deprecated and it
seems which is not really standard and may vary
across Distro.
Drop the use of which and use the standard 'command -v'
for this simple task.
Which is still present in the prereq if some package/script
still use which.
A utility script called command_all.sh is implemented that
will just mimic the output of which -a.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/bpf.mk | 2 | ||||
| -rw-r--r-- | include/cmake.mk | 2 | ||||
| -rw-r--r-- | include/prereq.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/bpf.mk b/include/bpf.mk index ce30e24434..7d0cfbd76d 100644 --- a/include/bpf.mk +++ b/include/bpf.mk @@ -10,7 +10,7 @@ ifneq ($(CONFIG_USE_LLVM_HOST),) else BPF_PATH:=$(PATH) endif - CLANG:=$(firstword $(shell PATH='$(BPF_PATH)' which clang clang-13 clang-12 clang-11)) + CLANG:=$(firstword $(shell PATH='$(BPF_PATH)' command -v clang clang-13 clang-12 clang-11)) LLVM_VER:=$(subst clang,,$(notdir $(CLANG))) endif ifneq ($(CONFIG_USE_LLVM_PREBUILT),) diff --git a/include/cmake.mk b/include/cmake.mk index b9a7e36dee..9b169b0693 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -24,7 +24,7 @@ MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1) else - cmake_tool=$(shell which $(1)) + cmake_tool=$(shell command -v $(1)) endif ifeq ($(CONFIG_CCACHE),) diff --git a/include/prereq.mk b/include/prereq.mk index 23d5ded9b2..0033535e78 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -49,7 +49,7 @@ endef define RequireCommand define Require/$(1) - which $(1) + command -v $(1) endef $$(eval $$(call Require,$(1),$(2))) @@ -103,7 +103,7 @@ define SetupHostCommand $(call QuoteHostCommand,$(11)) $(call QuoteHostCommand,$(12)); do \ if [ -n "$$$$$$$$cmd" ]; then \ bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \ - which "$$$$$$$${cmd%% *}")"; \ + command -v "$$$$$$$${cmd%% *}")"; \ if [ -x "$$$$$$$$bin" ] && eval "$$$$$$$$cmd" >/dev/null 2>/dev/null; then \ mkdir -p "$(STAGING_DIR_HOST)/bin"; \ ln -sf "$$$$$$$$bin" "$(STAGING_DIR_HOST)/bin/$(strip $(1))"; \ |