Skip to content
Snippets Groups Projects
Commit 012f16eb authored by Rene Brun's avatar Rene Brun
Browse files

From Axel:

remove -ptr flag for >=5.5


git-svn-id: http://root.cern.ch/svn/root/trunk@22175 27541ba8-7e3a-0410-8455-c3a389f83636
parent 73423c4d
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,13 @@ ifneq ($(OSTHREADLIB),) ...@@ -19,6 +19,13 @@ ifneq ($(OSTHREADLIB),)
MTOPT = -mt MTOPT = -mt
endif 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: # Compiler:
# used in cint/Module.mk # used in cint/Module.mk
...@@ -27,11 +34,11 @@ SUNCC5 = true ...@@ -27,11 +34,11 @@ SUNCC5 = true
#CC = /opt/WS5.0/bin/cc #CC = /opt/WS5.0/bin/cc
CXX = CC CXX = CC
CC = cc CC = cc
CXXFLAGS = -KPIC -I/usr/openwin/include -ptr$(ROOTSYS) $(EXTRA_CXXFLAGS) \ CXXFLAGS = -KPIC -I/usr/openwin/include $(CCPTR) $(EXTRA_CXXFLAGS) \
$(MTOPT) $(MTOPT)
CFLAGS = -KPIC -I/usr/openwin/include $(EXTRA_CFLAGS) $(MTOPT) CFLAGS = -KPIC -I/usr/openwin/include $(EXTRA_CFLAGS) $(MTOPT)
CINTCXXFLAGS = -KPIC -DG__REGEXP1 -DG__UNIX -DG__OSFDLL $(EXTRA_CXXFLAGS) \ 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) \ CINTCFLAGS = -KPIC -DG__REGEXP1 -DG__UNIX -DG__OSFDLL $(EXTRA_CFLAGS) \
-DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO $(MTOPT) -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO $(MTOPT)
CPPPREP = /usr/ccs/lib/cpp -E -C -B -D__sun -D__sparc -D__unix 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 ...@@ -39,7 +46,7 @@ CPPPREP = /usr/ccs/lib/cpp -E -C -B -D__sun -D__sparc -D__unix
# Linker: # Linker:
LD = $(CXX) LD = $(CXX)
LDFLAGS = $(OPT) $(EXTRA_LDFLAGS) LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
SOFLAGS = -G -ptr$(ROOTSYS) SOFLAGS = -G $(CCPTR)
SOEXT = so SOEXT = so
# System libraries: # System libraries:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment