Skip to content

Commit

Permalink
Modify Makefile to only specify ldflags once (#1471)
Browse files Browse the repository at this point in the history
They are not cumulative, so latter ldflags will cause the previous ones to not
be set. In this case, that caused the version information to not be set as
expected.

Closes #1469
  • Loading branch information
jpeeler authored and Ville Aikas committed Oct 23, 2017
1 parent 5d6afac commit 0bb9982
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ $(error Unsupported platform to compile for)
endif

GO_BUILD = env GOOS=$(PLATFORM) GOARCH=$(ARCH) go build -i $(GOFLAGS) \
-ldflags "-X $(SC_PKG)/pkg.VERSION=$(VERSION)" \
-ldflags "$(BUILD_LDFLAGS)"
-ldflags "-X $(SC_PKG)/pkg.VERSION=$(VERSION) $(BUILD_LDFLAGS)"
BASE_PATH = $(ROOT:/src/github.com/kubernetes-incubator/service-catalog/=)
export GOPATH = $(BASE_PATH):$(ROOT)/vendor

Expand Down

0 comments on commit 0bb9982

Please sign in to comment.