I missed a couple of things

--HG--
extra : convert_revision : 2fa44718e381ff743fa1cf12f4db2221dca87e4c

diff --git a/SConstruct b/SConstruct
index 12f735a9dace5474a42a05e92f10539a1fcab360..adcc9eb7cee8336334cbc472b37375c5088a240e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -219,7 +219,7 @@ env['SUNCC'] = subprocess.Popen(env['CXX'] + ' -V', shell=True,
 env['ICC'] = subprocess.Popen(env['CXX'] + ' -V', shell=True, 
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT, 
         close_fds=True).communicate()[0].find('Intel') >= 0
-if env['GCC'] + env['SUNCC'] env['ICC'] > 1:
+if env['GCC'] + env['SUNCC'] + env['ICC'] > 1:
     print 'Error: How can we have two at the same time?'
     Exit(1)
 

diff --git a/src/SConscript b/src/SConscript
index 59b2ec42c19a85f891c5fdff0a987e382618c29e..596dca253c3802b19b6f3a7944116c4025de7216 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -328,7 +328,7 @@ elif env['SUNCC']:
 elif env['ICC']:
     ccflags['debug'] = '-g -O0'
     ccflags['opt'] = '-g -O'
-    ccflags['fast'] = '-xW -O3 -ipo -no-prec-div -static'
+    ccflags['fast'] = '-fast'
     ccflags['prof'] = '-fast -g -pg'
 else:
     print 'Unknown compiler, please fix compiler options'