containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18827 from dfr/freebsd-bash 

Makefile: don't hard-code the path for bash
This commit is contained in:
OpenShift Merge Robot 2023-06-08 17:25:24 -04:00 committed by GitHub
parent dc1ddad930 7832879bf5
commit 4d43e1b40d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -21,7 +21,7 @@
### ###
# Default shell `/bin/sh` has different meanings depending on the platform. # Default shell `/bin/sh` has different meanings depending on the platform.
SHELL := /bin/bash SHELL := $(shell command -v bash)
GO ?= go GO ?= go
GO_LDFLAGS:= $(shell if $(GO) version|grep -q gccgo ; then echo "-gccgoflags"; else echo "-ldflags"; fi) GO_LDFLAGS:= $(shell if $(GO) version|grep -q gccgo ; then echo "-gccgoflags"; else echo "-ldflags"; fi)
GOCMD = CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) GOCMD = CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO)
@ -57,11 +57,6 @@ BUILDTAGS ?= \
$(shell hack/libsubid_tag.sh) \ $(shell hack/libsubid_tag.sh) \
exclude_graphdriver_devicemapper \ exclude_graphdriver_devicemapper \
seccomp seccomp
ifeq ($(shell uname -s),FreeBSD)
# Use bash for make's shell function - the default shell on FreeBSD
# has a command builtin is not compatible with the way its used below
SHELL := $(shell command -v bash)
endif
PYTHON ?= $(shell command -v python3 python|head -n1) PYTHON ?= $(shell command -v python3 python|head -n1)
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1) PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
# ~/.local/bin is not in PATH on all systems # ~/.local/bin is not in PATH on all systems