add case for icc v8.

diff --git a/build/Makefile.icc b/build/Makefile.icc
index 54fecb084baee0ead2fffee0119f59735e45ad30..9cffb66f29ac8e2ff34f6a517a6a3399479d47d4 100644 (file)
--- a/build/Makefile.icc
+++ b/build/Makefile.icc
@@ -1,21 +1,33 @@
 PLATFORM:=linuxicc
 
 PLATFORM:=linuxicc
 

-# The compilers
-CXX           = icc 
-F77          = ifort
-CC           = icc
+# The C/C++ compilers
+CXX           = icc
+CC            = icc
+
+# Compiler version:
+ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
+                cut -d'.' -f1)
+ICC_MINOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
+                cut -d'.' -f2)
+
+# The Fortran compiler
+ifeq ($(ICC_MAJOR),8)
+F77           = ifort
+else
+F77           = ifc
+endif

 
 # Global optimisation
 OPT           = -O -g
 
 CXXOPTS       = $(OPT)
 
 # Global optimisation
 OPT           = -O -g
 
 CXXOPTS       = $(OPT)

-COPT         = $(OPT)
-FOPT         = $(OPT)
+COPT          = $(OPT)
+FOPT          = $(OPT)

 CXXFLAGS      = $(CXXOPTS)
 CXXFLAGS      = $(CXXOPTS)

-CFLAGS       = $(COPT)
+CFLAGS        = $(COPT)

 
 # rootcint flags
 
 # rootcint flags

-CINTFLAGS     = 
+CINTFLAGS     =

 
 # CERNLIB defines
 
 
 # CERNLIB defines
 


@@ -25,26 +37,26 @@ CLIBCOPT      =
 CLIBFOPT      =
 
 # Common Fortran compilation flags
 CLIBFOPT      =
 
 # Common Fortran compilation flags

-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
+FFLAGS = $(CLIBFOPT) $(CLIBDEFS) $(FOPT)

 
 LD            = icc
 
 LD            = icc

-LDFLAGS       = $(OPT) 
+LDFLAGS       = $(OPT)

 
 

-SHLD         = $(LD)
+SHLD          = $(LD)

 SOFLAGS       = -Wl,-soname,$$TMPLIB -shared $(OPT)
 SHLIB         =
 SOEXT        = so
 
 SOFLAGS       = -Wl,-soname,$$TMPLIB -shared $(OPT)
 SHLIB         =
 SOEXT        = so
 

-ALLD         = ar
+ALLD          = ar

 ALFLAGS       = cr
 ALFLAGS       = cr

-ALLIB         = 
+ALLIB         =

 AEXT         = a
 
 # additional ROOT libraries
 AEXT         = a
 
 # additional ROOT libraries

-ROOTLIBS  += -lcrypt 
+ROOTLIBS     += -lcrypt

 
 # rmkdepend flags for building dependencies of FORTRAN files
 
 # rmkdepend flags for building dependencies of FORTRAN files

-DEPENDFFLAGS = $(FFLAGS)
+DEPENDFFLAGS  = $(FFLAGS)

 
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = $(LIBNOVER)
 
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = $(LIBNOVER)


@@ -52,8 +64,11 @@ GLIBS         = $(LIBNOVER)
 #System libraries
 SYSLIBS =
 
 #System libraries
 SYSLIBS =
 

-EXEFLAGS+= -L/usr/local/lib -lXt -L/opt/intel_fc_80/lib -lifport -lifcore
-
-
-
-
+EXEFLAGS     += -L/usr/local/lib -lXt
+ifeq ($(ICC_MAJOR),8)
+EXEFLAGS     += -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
+                -lifcore
+else
+EXEFLAGS     += -L$(shell which ifc | sed -e 's|bin/ifc|lib|') \
+                -lF90 -lCEPCF90 -lintrins
+endif