Merge pull request #2216 from jwillemsen/jwi-cxxversionchecks

Check for full match with major version
DOCGroup · Apr 15, 2024 · 198cf53 · 198cf53
2 parents c247ac5 + b0e4f06
commit 198cf53
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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