Enforce custom LDFLAGS within makefile #684
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
appleboy
approved these changes
Jan 17, 2017
|
LGTM |
tboerger
added
the
lgtm/need 1
|
LGTM |
tboerger
added
lgtm/done
bkcsoft
reviewed
Jan 20, 2017
| @@ -11,7 +11,7 @@ BINDATA := modules/{options,public,templates}/bindata.go | |||
| STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) | |||
| JAVASCRIPTS := | |||
|
|
|||
| LDFLAGS += -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" | |||
| LDFLAGS ?= -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" | |||
There was a problem hiding this comment.
This only makes it set LDFLAGS if it's is not set already
If you’d like a variable to be set to a value only if it’s not already set, then you can use the shorthand operator ‘?=’ instead of ‘=’
https://www.gnu.org/software/make/manual/html_node/Setting.html#Setting
There was a problem hiding this comment.
make with LDFLAGS
$ LDFLAGS="-X 'main.Version=1'" make clean build
go clean -i ./...
rm -rf gitea dist modules/{options,public,templates}/bindata.go
go build -v -tags '' -ldflags '-s -w -X 'main.Version=1'' -o gitea
missing LDFLAGS
$ make clean build
go clean -i ./...
rm -rf gitea dist modules/{options,public,templates}/bindata.go
go build -v -tags '' -ldflags '-s -w -X "main.Version=1.0.0+138-g68f7246"' -o gitea
There was a problem hiding this comment.
Exactly, it needs to be changed to LDFLAGS = :)
There was a problem hiding this comment.
LDFLAGS := and this is solved in another PR, #709
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #540