[cig-commits] commit: Merge in 1.4.1

[Mercurial]

changeset:   150:9c62fdde1b98
tag:         tip
parent:      143:4068942605b0
parent:      149:65f3a5e969cb
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Mar 23 16:40:26 2010 -0700
description:
Merge in 1.4.1


diff -r 4068942605b0 -r 9c62fdde1b98 .hgtags
--- a/.hgtags	Thu Feb 11 14:53:57 2010 -0800
+++ b/.hgtags	Tue Mar 23 16:40:26 2010 -0700
@@ -1,1 +1,3 @@ d3d473469dbf375fd1cd2af4f047ae2b0a016487
 d3d473469dbf375fd1cd2af4f047ae2b0a016487 v1.2.0
+9cfcb682e8a8d6ce3effe409a9cdc7f033713385 1.4.0
+257e1827ce8b3db52851ec4d136b47bfd402aca4 1.4.1
diff -r 4068942605b0 -r 9c62fdde1b98 Package.py
--- a/Package.py	Thu Feb 11 14:53:57 2010 -0800
+++ b/Package.py	Tue Mar 23 16:40:26 2010 -0700
@@ -169,10 +169,10 @@ class Package:
         # If this package was required and it failed print out a message.
         if not self.result and self.required:
             print
+            print '****  ERROR ****'
             print 'Failed to locate required package %s.'%self.name
             print 'Details in \'config.log\''
-            print
-            self.env.Exit()
+            self.env.UWExit()
 
         # If successful, update the original environment.
         if self.result:
diff -r 4068942605b0 -r 9c62fdde1b98 cc.py
--- a/cc.py	Thu Feb 11 14:53:57 2010 -0800
+++ b/cc.py	Tue Mar 23 16:40:26 2010 -0700
@@ -2,7 +2,8 @@ import checks
 
 def apply_cc(env, cc):
     if cc in ['gcc']:
-        env.Tool(cc)
+        pass
+        #env.Tool(cc)
     elif cc == 'xlc':
         pass
 
diff -r 4068942605b0 -r 9c62fdde1b98 config.py
--- a/config.py	Thu Feb 11 14:53:57 2010 -0800
+++ b/config.py	Tue Mar 23 16:40:26 2010 -0700
@@ -52,7 +52,7 @@ def PrintSummary(env):
     if not (GetOption('help') or GetOption('clean')):
         print ''
         print 'C compiler:     %s'%repr(env['CC'])
-        print 'C flags:        %s'%repr(env.get('CFLAGS', []) + env.get('CCFLAGS', []))
+        print 'C flags:        %s'%env.subst('$CFLAGS $CCFLAGS')
         print 'C preprocessor: %s'%repr(env.get('CPPDEFINES'))
         print ''