diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2022-08-23 17:01:34 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-08-23 17:01:34 +0200 |
| commit | 5936b5bedb1c0fca973fb5809f0f636002d21972 (patch) | |
| tree | e9bc117da4162ed679f1785c3e0e41eb8f00c919 /make_helpers | |
| parent | d97fc8de852ec5d60f9056c8b79ab6a30de78675 (diff) | |
| parent | 3aa8fa77f2126237ad7dae8d3bdd0c88f9b9c953 (diff) | |
| download | arm-trusted-firmware-5936b5bedb1c0fca973fb5809f0f636002d21972.tar.gz | |
Merge "build: fix semantic ver generation for windows" into integration
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/windows.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make_helpers/windows.mk b/make_helpers/windows.mk index 0f78f61a7..d95d7ee3c 100644 --- a/make_helpers/windows.mk +++ b/make_helpers/windows.mk @@ -81,9 +81,9 @@ BUILD_STRING ?= development build # by defining the MAKE_BUILD_STRINGS macro. BUILT_TIME_DATE_STRING = const char build_message[] = "Built : "${BUILD_MESSAGE_TIMESTAMP}; VERSION_STRING_MESSAGE = const char version_string[] = "${VERSION_STRING}"; -const char version[] = "${VERSION}"; +VERSION_MESSAGE = const char version[] = "${VERSION}"; define MAKE_BUILD_STRINGS - @echo $$(BUILT_TIME_DATE_STRING) $$(VERSION_STRING_MESSAGE) | \ + @echo $$(BUILT_TIME_DATE_STRING) $$(VERSION_STRING_MESSAGE) $$((VERSION_MESSAGE)) | \ $$(CC) $$(TF_CFLAGS) $$(CFLAGS) -x c -c - -o $1 endef |