From f393d8ab651e6cc0b7a2dc4dc0a1cbfc3ebea1ce Mon Sep 17 00:00:00 2001
From: rdm <rdm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 25 May 2005 09:03:02 +0000
Subject: [PATCH] remove special cases for icc v7 (support only icc v8 and
 higher).

---
 build/Makefile.linuxia64ecc |  8 ++++----
 build/Makefile.linuxicc     | 11 +----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/build/Makefile.linuxia64ecc b/build/Makefile.linuxia64ecc
index c1aebf4f259..355ad3e4aa0 100644
--- a/build/Makefile.linuxia64ecc
+++ b/build/Makefile.linuxia64ecc
@@ -1,9 +1,9 @@
 # Makefile for AliRoot for Itanium/Linux with Intel icc compiler
 
 # The compilers
-CXX           = ecc 
-F77	      = efc
-CC	      = ecc
+CXX           = icc 
+F77	      = ifort
+CC	      = icc
 
 # Global optimisation
 OPT           = -g #-O
@@ -31,7 +31,7 @@ DEPENDFFLAGS  = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     = 
 
-LD            = ecc
+LD            = icpc
 LDFLAGS       = $(OPT) 
 
 SHLD	      = $(LD)
diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index 7fbd75507bd..8efedf2635e 100644
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -10,11 +10,7 @@ ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
 ICC_MINOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f2)
 
-ifeq ($(ICC_MAJOR),8)
 F77           = ifort
-else
-F77           = ifc
-endif
 
 # Global optimisation
 OPT           = -O -ip
@@ -42,7 +38,7 @@ DEPENDFFLAGS  = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     =
 
-LD            = icc
+LD            = icpc
 LDFLAGS       = $(OPT)
 
 SHLD          = $(LD)
@@ -65,10 +61,5 @@ GLIBS         = $(LIBNOVER)
 SYSLIBS =
 
 EXEFLAGS     += -L/usr/local/lib -lXt
-ifeq ($(ICC_MAJOR),8)
 EXEFLAGS     += -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
                 -lifcore -lifport
-else
-EXEFLAGS     += -L$(shell which ifc | sed -e 's|bin/ifc|lib|') \
-                -lF90 -lCEPCF90 -lintrins
-endif
-- 
2.43.0