Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 13:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build type is empty in version string

Browse source 
Signed-off-by: Peiyuan Song <squallatf@gmail.com>
Change-Id: I97c2e6f8c12ecf828605811019d47a24293c1ebb
This commit is contained in:
Peiyuan Song 2020-04-25 16:53:43 +08:00
parent 9c1a6f4e71
commit f1de4c8fd7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -94,12 +94,6 @@ endif
export Q ECHO export Q ECHO
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
endif
VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}
# The cert_create tool cannot generate certificates individually, so we use the # The cert_create tool cannot generate certificates individually, so we use the
# target 'certificates' to create them all # target 'certificates' to create them all
ifneq (${GENERATE_COT},0) ifneq (${GENERATE_COT},0)
@ -281,6 +275,12 @@ else
LOG_LEVEL := 20 LOG_LEVEL := 20
endif endif
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
endif
VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}
ifeq (${AARCH32_INSTRUCTION_SET},A32) ifeq (${AARCH32_INSTRUCTION_SET},A32)
TF_CFLAGS_aarch32 += -marm TF_CFLAGS_aarch32 += -marm
else ifeq (${AARCH32_INSTRUCTION_SET},T32) else ifeq (${AARCH32_INSTRUCTION_SET},T32)