From a6ac7cd8761e8a949e44c9503cdb28fc3f5a8dcc Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 2 Aug 2023 19:30:40 +0200 Subject: [PATCH] common.mak: set `SHELL` to `/bin/bash` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the following error (using GNU Make 4.3.0): make[2]: command: Command not found The reason for this is that `command` is a bash builtin. `command` is used in `common.mak` for the `combdb` Makefile target. While at it, remove the now useless `SHELL := /bin/bash` definitions in the sub-Makefiles. Fixes: 3d098416c688 ("common.mak: add `compdb` Makefile target") Reviewed-by: Jan Höppner Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- chreipl-fcp-mpath/Makefile | 1 - common.mak | 2 ++ rust/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chreipl-fcp-mpath/Makefile b/chreipl-fcp-mpath/Makefile index e7fb920d..cb7f27ba 100644 --- a/chreipl-fcp-mpath/Makefile +++ b/chreipl-fcp-mpath/Makefile @@ -17,7 +17,6 @@ # GNU awk: # - gawk -override SHELL := /bin/bash override .SHELLFLAGS := -O globstar -O nullglob -O extglob -c # Include common s390-tools definitions diff --git a/common.mak b/common.mak index 424f952b..a1ffd214 100644 --- a/common.mak +++ b/common.mak @@ -14,6 +14,8 @@ CARGOFLAGS ?= ifeq ($(COMMON_INCLUDED),false) COMMON_INCLUDED := true +override SHELL := /bin/bash + # 'BUILD_ARCH' is the architecture of the machine where the build takes place BUILD_ARCH := $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sun4u/sparc64/' -e 's/arm.*/arm/' -e 's/sa110/arm/') # 'HOST_ARCH' is the architecture of the machine that will run the compiled output diff --git a/rust/Makefile b/rust/Makefile index d4a1c5f9..cf2fda70 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -1,5 +1,4 @@ include ../common.mak -SHELL := /bin/bash HAVE_CARGO ?= 1 HAVE_OPENSSL ?= 1 HAVE_LIBCURL ?= 1