From 76d847e6ffe7800b5bbb63f954539a8e9c1e8bc9 Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Mon, 12 Dec 2022 12:50:01 -0500 Subject: [PATCH] Include PRODUCT_SUFFIX in J9PRODUCT_NAME Issue https://github.com/eclipse-openj9/openj9/issues/16449 Signed-off-by: Peter Shipton --- closed/OpenJ9.gmk | 1 + closed/openj9_version_info.h.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index 6bf072e1058..83ebb55d6a4 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -325,6 +325,7 @@ OPENJ9_VERSION_VARS := \ OPENJDK_TARGET_CPU_OSARCH \ OPENJDK_TARGET_OS \ PRODUCT_NAME \ + PRODUCT_SUFFIX \ USERNAME \ VERSION_STRING \ # diff --git a/closed/openj9_version_info.h.in b/closed/openj9_version_info.h.in index b22fac4d8f8..8ef9b786070 100644 --- a/closed/openj9_version_info.h.in +++ b/closed/openj9_version_info.h.in @@ -1,6 +1,6 @@ /* * =========================================================================== - * (c) Copyright IBM Corp. 2017, 2020 All Rights Reserved + * (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved * =========================================================================== * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ #define OPENJ9_VERSION_INFO_H #define J9COMPILER_VERSION_STRING "@COMPILER_VERSION_STRING@" -#define J9PRODUCT_NAME "@PRODUCT_NAME@" +#define J9PRODUCT_NAME "@PRODUCT_NAME@ @PRODUCT_SUFFIX@" #define J9TARGET_CPU_BITS "@OPENJDK_TARGET_CPU_BITS@" #define J9TARGET_CPU_OSARCH "@OPENJDK_TARGET_CPU_OSARCH@" #define J9TARGET_OS "@OPENJDK_TARGET_OS@"