From b0e4f06810a909c171b5012d1c0bf808f1729dcf Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 11 Apr 2024 13:05:10 +0200
Subject: [PATCH] Check for full match with major version

    * ACE/include/makeinclude/platform_g++_common.GNU:
---
 ACE/include/makeinclude/platform_g++_common.GNU | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 36dbcd43df074..92d805083c428 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -75,16 +75,16 @@ endif
 CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
 
 # Minimum C++ level is now C++17, gcc until version 11 have an older version as default
-ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION))
+ifeq ($(CXX_MAJOR_VERSION),7)
   c++std ?= c++17
 endif
-ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION))
+ifeq ($(CXX_MAJOR_VERSION),8)
   c++std ?= c++17
 endif
-ifeq ($(findstring $(CXX_MAJOR_VERSION),9),$(CXX_MAJOR_VERSION))
+ifeq ($(CXX_MAJOR_VERSION),9)
   c++std ?= c++17
 endif
-ifeq ($(findstring $(CXX_MAJOR_VERSION),10),$(CXX_MAJOR_VERSION))
+ifeq ($(CXX_MAJOR_VERSION),10)
   c++std ?= c++17
 endif