Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
2866ea14
Commit
2866ea14
authored
Feb 16, 2017
by
davidcunado-arm
Committed by
GitHub
Feb 16, 2017
Browse files
Merge pull request #829 from masahir0y/build
Makefile: use git describe for BUILD_STRING
parents
7a1c268f
bee71c7a
Changes
1
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
2866ea14
...
@@ -111,7 +111,7 @@ endif
...
@@ -111,7 +111,7 @@ endif
# Default build string (git branch and commit)
# Default build string (git branch and commit)
ifeq
(${BUILD_STRING},)
ifeq
(${BUILD_STRING},)
BUILD_STRING
:=
$(
shell
git
log
-n
1
--pretty
=
format:
"%h"
)
BUILD_STRING
:=
$(
shell
git
describe
--always
--dirty
--tags
2> /dev/null
)
endif
endif
VERSION_STRING
:=
v
${VERSION_MAJOR}
.
${VERSION_MINOR}
(
${BUILD_TYPE}
)
:
${BUILD_STRING}
VERSION_STRING
:=
v
${VERSION_MAJOR}
.
${VERSION_MINOR}
(
${BUILD_TYPE}
)
:
${BUILD_STRING}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment