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