diff options
| author | Peiyuan Song <squallatf@gmail.com> | 2020-04-25 16:53:43 +0800 |
|---|---|---|
| committer | Peiyuan Song <squallatf@gmail.com> | 2020-04-25 16:56:34 +0800 |
| commit | f1de4c8fd729ba14b3c1b714f14eaeb763c3cbd1 (patch) | |
| tree | a541a91f4fd0e9800416e01c9ea21524b7d94b91 | |
| parent | 9c1a6f4e71221d1177616fec7fafc0ff8f4e6899 (diff) | |
| download | arm-trusted-firmware-f1de4c8fd729ba14b3c1b714f14eaeb763c3cbd1.tar.gz | |
Fix build type is empty in version string
Signed-off-by: Peiyuan Song <squallatf@gmail.com>
Change-Id: I97c2e6f8c12ecf828605811019d47a24293c1ebb
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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) |