Removing obsolete option

[u/mrichter/AliRoot.git] / build / Makefile.macosx64

diff --git a/build/Makefile.macosx64 b/build/Makefile.macosx64
index b56957097e2d8128057210a1c94f5b9ef99d8801..df2451631f2e38601ed1fa61a6b8f997a2b349b2 100644 (file)
--- a/build/Makefile.macosx64
+++ b/build/Makefile.macosx64
@@ -15,8 +15,8 @@ FINK_ROOT=/usr/local
 endif
 
 # The compilers
-CXX           = g++ 
-CC           = gcc
+CXX           = $(shell root-config --cxx) 
+CC           = $(shell root-config --cc)
 F77          = $(shell root-config --f77)
 
 # Global optimisation
@@ -27,7 +27,7 @@ CXXOPT        = $(OPT)
 CXXNOOPT      = $(NOOPT) 
 COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore -m64
-ifeq (g95,$(F77))
+ifneq (,$(findstring g95,$(F77)))
 FOPT        += -fbounds-check
 endif
 
@@ -36,8 +36,9 @@ CLIBDEFS      = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ -DCERNLIB_PPC
 CLIBCXXOPTS   =
 CLIBCOPT      =
 CLIBFOPT      = $(CLIBDEFS)
+CXXSTF        = -m64 -pipe -Wall -W -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -Woverloaded-virtual -Weffc++ -Wconversion -Wshadow -fno-default-inline -fno-inline -I/usr/X11R6/include -I$(FINK_ROOT)/include
 
-CXXSTF        = -m64 -pipe -Wall -W -Wno-long-double -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -Woverloaded-virtual -Weffc++ -Wconversion -Wshadow -fno-default-inline -fno-inline -I/usr/X11R6/include -I$(FINK_ROOT)/include
+CXXSTF        = -m64 -pipe -Wall -W -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -Woverloaded-virtual -Weffc++ -Wshadow -fno-default-inline -fno-inline -I/usr/X11R6/include -I$(FINK_ROOT)/include
 
 # Compiler flags
 CXXFLAGS      = $(CXXOPT) $(CXXSTF)
@@ -47,7 +48,7 @@ CXXFLAGSNO    = $(CXXNOOPT) $(CXXSTF)
 CFLAGS       = $(COPT) -m64 -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include
 
 FFLAGS        = $(CLIBFOPT) $(FOPT)
-ifeq (g95,$(F77))
+ifneq (,$(findstring g95,$(F77)))
 FFLAGS        += -ftrace=full
 FFLAGS       +=-DFORTRAN_G95
 else
@@ -62,7 +63,7 @@ CINTFLAGS     =
 
 LD            = export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_MAJOR).$(MACOSX_MINOR) ; \
                unset LD_PREBIND ; \
-               g++
+               $(shell root-config --ld)
 LDFLAGS       = $(OPT) -m64 $(DICTLOAD)
 
 SHLD        := $(LD)
@@ -88,8 +89,8 @@ EXEFLAGS     := -bind_at_load
 
 #System libraries
 
-ifeq (g95,$(F77))
-SYSLIBS += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
+ifneq (,$(findstring g95,$(F77)))
+SYSLIBS += -L$(shell $(F77) --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
 SYSLIBS += -ldl $(shell $(F77) -m64 -print-file-name=libgfortran.dylib)
 SYSLIBS += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)