From 7dbb71b944117cb5c4e4ff0caa24d5af32206ea0 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 31 May 2000 17:20:42 +0000
Subject: [PATCH] Introduce same options as they were in the CMZ file
git-svn-id: http://root.cern.ch/svn/root/trunk@64 27541ba8-7e3a-0410-8455-c3a389f83636
---
config/Makefile.sgicc | 10 +++++-----
config/Makefile.sgiegcs | 18 +++++++++---------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/config/Makefile.sgicc b/config/Makefile.sgicc
index a26639915d6..0af44ce620e 100644
--- a/config/Makefile.sgicc
+++ b/config/Makefile.sgicc
@@ -13,11 +13,11 @@ endif
# Compiler:
CXX = CC
CC = cc
-CXXFLAGS = -n32 -signed -DIRIX64 -DSGI_REL=62 -I/usr/include/CC.sgi $(EXTRA_CXXFLAGS)
-CFLAGS = -n32 -signed -DSGI_REL=62 $(EXTRA_CFLAGS)
-CINTCXXFLAGS = -n32 -signed -DSGI_REL=62 -DG__REGEXP1 -DG__UNIX -DG__OSFDLL \
- -DG__SHAREDLIB -DG__SIGNEDCHAR -DG__ROOT -DG__REDIRECTIO -I/usr/include/CC.sgi $(EXTRA_CXXFLAGS)
-CINTCFLAGS = -n32 -signed -DSGI_REL=62 -DG__REGEXP1 -DG__UNIX -DG__OSFDLL \
+CXXFLAGS = -n32 -signed -DIRIX64 -DSGI_REL=62 $(EXTRA_CXXFLAGS) -I/usr/include/CC.sgi
+CFLAGS = -n32 -signed -DIRIX64 $(EXTRA_CFLAGS)
+CINTCXXFLAGS = -n32 -signed -w -DIRIX64 -DG__REGEXP1 -DG__UNIX -DG__OSFDLL \
+ -DG__SHAREDLIB -DG__SIGNEDCHAR -DG__ROOT -DG__REDIRECTIO $(EXTRA_CXXFLAGS) -I/usr/include/CC.sgi
+CINTCFLAGS = -n32 -signed -w -DIRIX64 -DG__REGEXP1 -DG__UNIX -DG__OSFDLL \
-DG__SHAREDLIB -DG__SIGNEDCHAR -DG__ROOT -DG__REDIRECTIO $(EXTRA_CFLAGS)
# Linker:
diff --git a/config/Makefile.sgiegcs b/config/Makefile.sgiegcs
index 2a173fe853c..1b8dbc3901d 100644
--- a/config/Makefile.sgiegcs
+++ b/config/Makefile.sgiegcs
@@ -11,26 +11,26 @@ NOOPT =
endif
# Compiler:
-CXX = gcc
-CC = cc
-CXXFLAGS = -ansi -fsigned-chars -Wall -fPIC -fno-exceptions $(EXTRA_CXXFLAGS)
-CFLAGS = $(EXTRA_CFLAGS)
-CINTCXXFLAGS = -ansi -fsigned-chars -Wall -fPIC -fno-exceptions -DG__REGEXP1 \
+CXX = g++
+CC = gcc
+CXXFLAGS = -ansi -fsigned-char -Wall -fPIC $(EXTRA_CXXFLAGS)
+CFLAGS = -fsigned-char -fPIC $(EXTRA_CFLAGS)
+CINTCXXFLAGS = -ansi -fsigned-char -Wall -fPIC -DG__REGEXP1 \
-DG__UNIX -DG__SIGNEDCHAR -DG__SHAREDLIB -DG__OSFDLL \
-DG__ROOT -DG__REDIRECTIO $(EXTRA_CXXFLAGS)
-CINTCFLAGS = -signed -DG__REGEXP1 -DG__SIGNEDCHAR -DG__UNIX -DG__SHAREDLIB \
+CINTCFLAGS = -fsigned-char -DG__REGEXP1 -DG__SIGNEDCHAR -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO $(EXTRA_CFLAGS)
# Linker:
-LD = gcc
+LD = g++
LDFLAGS = $(OPT) -Wl,-u,__builtin_new -Wl,-u,__builtin_delete \
-Wl,-u,__nw__FUiPv $(EXTRA_LDFLAGS)
SOFLAGS = -shared
SOEXT = so
# System libraries:
-SYSLIBS = -lstdc++ -lm
+SYSLIBS = -lg++ -lm -lPW -ldl
XLIBS = $(XPMLIB) -L/usr/X11R6/lib -lX11
-CILIBS = -lstdc++ -lgen -lm -lbsd
+CILIBS = -lm -ltermcap -lbsd -ldl -lg++
--
GitLab