From 012f16eb2a56148b983c14a898c87921572c6651 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Sat, 16 Feb 2008 07:27:03 +0000
Subject: [PATCH] From Axel: remove -ptr flag for >=5.5
git-svn-id: http://root.cern.ch/svn/root/trunk@22175 27541ba8-7e3a-0410-8455-c3a389f83636
---
config/Makefile.solarisCC5 | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/config/Makefile.solarisCC5 b/config/Makefile.solarisCC5
index 8fe4cf6d0a8..d3b057a4958 100644
--- a/config/Makefile.solarisCC5
+++ b/config/Makefile.solarisCC5
@@ -19,6 +19,13 @@ ifneq ($(OSTHREADLIB),)
MTOPT = -mt
endif
+CC_MINOR_VER := $(shell CC -V 2>&1 | sed 's,^.*5\.\([^[:space:]]*\).*$$,\1,')
+
+CCPTR := -ptr$(ROOTSYS)
+ifeq ($(findstring $(CC_MINOR_VER),0 1 2 3 4),)
+# newer than 5.4
+CCPTR :=
+endif
# Compiler:
# used in cint/Module.mk
@@ -27,11 +34,11 @@ SUNCC5 = true
#CC = /opt/WS5.0/bin/cc
CXX = CC
CC = cc
-CXXFLAGS = -KPIC -I/usr/openwin/include -ptr$(ROOTSYS) $(EXTRA_CXXFLAGS) \
+CXXFLAGS = -KPIC -I/usr/openwin/include $(CCPTR) $(EXTRA_CXXFLAGS) \
$(MTOPT)
CFLAGS = -KPIC -I/usr/openwin/include $(EXTRA_CFLAGS) $(MTOPT)
CINTCXXFLAGS = -KPIC -DG__REGEXP1 -DG__UNIX -DG__OSFDLL $(EXTRA_CXXFLAGS) \
- -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -ptr$(ROOTSYS) $(MTOPT)
+ -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO $(CCPTR) $(MTOPT)
CINTCFLAGS = -KPIC -DG__REGEXP1 -DG__UNIX -DG__OSFDLL $(EXTRA_CFLAGS) \
-DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO $(MTOPT)
CPPPREP = /usr/ccs/lib/cpp -E -C -B -D__sun -D__sparc -D__unix
@@ -39,7 +46,7 @@ CPPPREP = /usr/ccs/lib/cpp -E -C -B -D__sun -D__sparc -D__unix
# Linker:
LD = $(CXX)
LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
-SOFLAGS = -G -ptr$(ROOTSYS)
+SOFLAGS = -G $(CCPTR)
SOEXT = so
# System libraries:
--
GitLab