denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency from 'which' utility

Browse Source 
Debian declared the 'which' utility as deprecated.

Fixes #4319
This commit is contained in:
Norman Feske
2021-11-08 21:15:54 +01:00
committed by Christian Helmuth
parent 293d545b97
commit 4cfd954e1e
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tool/builddir/build.mk
View File

@@ -81,7 +81,7 @@ BASE_DIR := $(realpath $(shell echo $(BASE_DIR)))
# standard shell is dash, which breaks colored output via its built-in echo
# command.
#
export SHELL := $(shell which bash)
export SHELL := $(shell sh -c "command -v bash")
#
# Discharge variables evaluated by ccache mechanism that may be inherited when
@@ -137,7 +137,7 @@ endif
#
# Helper function to check if a needed tool is installed
#
check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
check_tool = $(if $(shell command -v $(1)),,$(error Need to have '$(1)' installed.))
#
# Tool chain version check
@@ -363,7 +363,7 @@ gen_deps_and_build_targets: $(CCACHED_CUSTOM_CC) $(CCACHED_CUSTOM_CXX)
# create ccache symlinks at var/tool/ccache/
$(CCACHED_CUSTOM_CC) $(CCACHED_CUSTOM_CXX):
$(VERBOSE_MK)mkdir -p $(dir $@)
$(VERBOSE_MK)ln -sf `which ccache` $@
$(VERBOSE_MK)ln -sf `command -v ccache` $@
# supplement tool-chain directory to the search-path variable used by ccache
ifneq ($(filter /%,$(CUSTOM_CXX)),)