From: Ali Saidi Date: Sat, 27 Jan 2007 20:47:18 +0000 (-0500) Subject: I missed a couple of things X-Git-Tag: m5_2.0_beta3~238^2~3 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9a341f8e7871135e52d208c65185c96c1e51de5;p=gem5.git I missed a couple of things --HG-- extra : convert_revision : 2fa44718e381ff743fa1cf12f4db2221dca87e4c --- diff --git a/SConstruct b/SConstruct index 12f735a9d..adcc9eb7c 100644 --- 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 59b2ec42c..596dca253 100644 --- 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'