Skip to content

Commit f61f21e

Browse files
committed
Makefile: remove use of quotes in the GOFLAGS
Our builder image uses a wrapper script on top of the go binary. This wrapper is not keeping the quotes as they are set in the Makefile, making the resulting parameters to the 'go' command miss a closing quote. This commit fixes it by removing quotes in the GOFLAGS variable in the Makefile. Signed-off-by: Julien Ropé <[email protected]>
1 parent 30f3631 commit f61f21e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/cloud-api-adaptor/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ help: ## Display this help.
7676
VERSION ?= $(shell git describe --match "v[0-9]*" --tags 2> /dev/null | sed -E 's/-[0-9]+-g[0-9a-f]+$$/-dev/' || echo unknown)
7777
COMMIT ?= $(shell cat .git-commit)
7878

79-
GOFLAGS += -ldflags="-X 'github.com/openshift/cloud-api-adaptor/src/cloud-api-adaptor/cmd.VERSION=$(VERSION)' \
80-
-X 'github.com/openshift/cloud-api-adaptor/src/cloud-api-adaptor/cmd.COMMIT=$(COMMIT)'"
79+
GOFLAGS += -ldflags=-X='github.com/openshift/cloud-api-adaptor/src/cloud-api-adaptor/cmd.VERSION=$(VERSION)' \
80+
-ldflags=-X='github.com/openshift/cloud-api-adaptor/src/cloud-api-adaptor/cmd.COMMIT=$(COMMIT)'
8181

8282
# Build tags required to build cloud-api-adaptor are derived from BUILTIN_CLOUD_PROVIDERS.
8383
# When libvirt is specified, CGO_ENABLED is set to 1.

0 commit comments

Comments
 (0)