Use CXX_VERSION_STRING instead of COMPILER_VERSION_STRING

COMPILER_VERSION_STRING seems an internal variable that shouldn't be
used.

Backport ibmruntimes/openj9-openjdk-jdk#1010

Signed-off-by: Peter Shipton <[email protected]>

Author: pshipton

closed/OpenJ9.gmk

@@ -197,7 +197,7 @@ $(foreach file, \
 
 OPENJ9_VERSION_VARS := \
 	COMPANY_NAME \
-	COMPILER_VERSION_STRING \
+	CXX_VERSION_STRING \
 	DEBUG_LEVEL \
 	J9JDK_EXT_NAME \
 	J9JDK_EXT_VERSION \

closed/autoconf/custom-hook.m4

@@ -550,11 +550,11 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
 
   OPENJ9_BUILDSPEC="${OPENJ9_BUILD_OS}_${OPENJ9_BUILD_MODE_ARCH}"
 
+  AC_SUBST(CXX_VERSION_STRING)
+  AC_SUBST(OMR_MIXED_REFERENCES_MODE)
   AC_SUBST(OPENJ9_BUILDSPEC)
-  AC_SUBST(OPENJ9_PLATFORM_CODE)
-  AC_SUBST(COMPILER_VERSION_STRING)
   AC_SUBST(OPENJ9_LIBS_SUBDIR)
-  AC_SUBST(OMR_MIXED_REFERENCES_MODE)
+  AC_SUBST(OPENJ9_PLATFORM_CODE)
 ])
 
 AC_DEFUN([OPENJ9_CHECK_NASM_VERSION],

closed/autoconf/custom-spec.gmk.in

@@ -79,7 +79,7 @@ OPENJ9_ENABLE_JITSERVER    := @OPENJ9_ENABLE_JITSERVER@
 OPENJ9_ENABLE_SNAPSHOTS    := @OPENJ9_ENABLE_SNAPSHOTS@
 
 # for constructing version output
-COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@
+CXX_VERSION_STRING := @CXX_VERSION_STRING@
 
 include $(TOPDIR)/closed/openjdk-tag.gmk
 

closed/openj9_version_info.h.in

@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved
  * ===========================================================================
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
@@ -23,7 +23,7 @@
 #ifndef OPENJ9_VERSION_INFO_H
 #define OPENJ9_VERSION_INFO_H
 
-#define J9COMPILER_VERSION_STRING "@COMPILER_VERSION_STRING@"
+#define J9COMPILER_VERSION_STRING "@CXX_VERSION_STRING@"
 #define J9PRODUCT_NAME            "@PRODUCT_NAME@ @PRODUCT_SUFFIX@"
 #define J9TARGET_CPU_BITS         "@OPENJDK_TARGET_CPU_BITS@"
 #define J9TARGET_CPU_OSARCH       "@OPENJDK_TARGET_CPU_OSARCH@"