Merge IGNORE_STYLE change and my change.

--HG--
extra : convert_revision : 13880ec6df17b0317d4097243bb24add753a098a

util/regress

@@ -82,6 +82,7 @@ def shellquote(s):
         s = "'%s'" % s
     return s
 
+<<<<<<< /z/saidi/work/m5/util/regress
 if not tests:
     print "No tests specified, just building binaries."
     targets = ['build/%s/m5.%s' % (build, variant)
@@ -105,7 +106,6 @@ scons_opts = options.scons_opts
 if options.jobs != 1:
     scons_opts += ' -j %d' % options.jobs
 
-system('scons %s %s' % (scons_opts, ' '.join(targets)))
+system('scons IGNORE_STYLE=True %s %s' % (scons_opts, ' '.join(targets)))
 
 sys.exit(0)
-