Skip to content

Commit

Permalink
Merge pull request #18827 from dfr/freebsd-bash
Browse files Browse the repository at this point in the history
Makefile: don't hard-code the path for bash
  • Loading branch information
openshift-merge-robot authored Jun 8, 2023
2 parents dc1ddad + 7832879 commit 4d43e1b
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
###

# Default shell `/bin/sh` has different meanings depending on the platform.
SHELL := /bin/bash
SHELL := $(shell command -v bash)
GO ?= go
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)
Expand Down Expand Up @@ -57,11 +57,6 @@ BUILDTAGS ?= \
$(shell hack/libsubid_tag.sh) \
exclude_graphdriver_devicemapper \
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)
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
# ~/.local/bin is not in PATH on all systems
Expand Down

0 comments on commit 4d43e1b

Please sign in to comment.