aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2020-05-05 08:37:47 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-05-05 08:37:47 +0000
commit659bf156f15a334670d56bc6d0022706d1711b58 (patch)
tree87770f64cec0752697826e4cee40c3ace97346d5
parent658086747dc638e3012a052293e855339d211a95 (diff)
parentf1de4c8fd729ba14b3c1b714f14eaeb763c3cbd1 (diff)
downloadtrusted-firmware-a-659bf156f15a334670d56bc6d0022706d1711b58.tar.gz
Merge "Fix build type is empty in version string" into integration
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f01a9ae3ed..5c4f36c4f5 100644
--- a/Makefile
+++ b/Makefile
@@ -94,12 +94,6 @@ endif
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
# target 'certificates' to create them all
ifneq (${GENERATE_COT},0)
@@ -281,6 +275,12 @@ else
LOG_LEVEL := 20
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)
TF_CFLAGS_aarch32 += -marm
else ifeq (${AARCH32_INSTRUCTION_SET},T32)