Removed workarounds for ancient ubuntu versions, only set CXX_FULL_VE…

…RSION and CXX_VERSION when not set yet * ACE/include/makeinclude/platform_linux.GNU:
DOCGroup · Nov 12, 2024 · 52a2e24 · 52a2e24
1 parent 1b0fa02
commit 52a2e24
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
@@ -10,16 +10,11 @@ else
   CXX_FOR_VERSION_TEST ?= g++
 endif
 
-CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
-CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion)
-
-ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID)))
-  ifeq (7.10, $(findstring 7.10,$(LSB_RELEASE_RELEASE)))
-    no_hidden_visibility ?= 1
-  endif
-  ifeq (7.04, $(findstring 7.04,$(LSB_RELEASE_RELEASE)))
-    no_hidden_visibility ?= 1
-  endif
+ifndef CXX_FULL_VERSION
+  CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
+endif
+ifndef CXX_VERSION
+  CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion)
 endif
 
 ifeq ($(buildbits),32)