kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

common.mak: set SHELL to /bin/bash

Browse Source 
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: 3d098416c6 ("common.mak: add `compdb` Makefile target")
Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2023-08-02 19:30:40 +02:00
committed by Jan Höppner
parent 28751a097a
commit a6ac7cd876
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chreipl-fcp-mpath/Makefile
View File

@@ -17,7 +17,6 @@
# GNU awk: # GNU awk:
# - gawk # - gawk
override SHELL := /bin/bash
override .SHELLFLAGS := -O globstar -O nullglob -O extglob -c override .SHELLFLAGS := -O globstar -O nullglob -O extglob -c
# Include common s390-tools definitions # Include common s390-tools definitions

2
common.mak
View File

@@ -14,6 +14,8 @@ CARGOFLAGS ?=
ifeq ($(COMMON_INCLUDED),false) ifeq ($(COMMON_INCLUDED),false)
COMMON_INCLUDED := true COMMON_INCLUDED := true
override SHELL := /bin/bash
# 'BUILD_ARCH' is the architecture of the machine where the build takes place # '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/') 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 # 'HOST_ARCH' is the architecture of the machine that will run the compiled output

1
rust/Makefile
View File

@@ -1,5 +1,4 @@
include ../common.mak include ../common.mak
SHELL := /bin/bash
HAVE_CARGO ?= 1 HAVE_CARGO ?= 1
HAVE_OPENSSL ?= 1 HAVE_OPENSSL ?= 1
HAVE_LIBCURL ?= 1 HAVE_LIBCURL ?= 1