[cig-commits] commit: Now the flag "with_debug=1" will override the "with_optimise=1" flag - hence debug flags and optimisation flag won't get confused.

[Mercurial]

changeset:   23:d3d473469dbf
tag:         v1.2.0
user:        Julian Giordani <julian.giordani at sci.monash.edu.au>
date:        Thu Oct 09 23:49:12 2008 +1100
files:       SConfig/Project.py
description:
Now the flag "with_debug=1" will override the "with_optimise=1" flag - hence debug flags and optimisation flag won't get confused.
So now one just needs with_debug=1, to get correct debug symbols.


diff -r d7582b5257fc -r d3d473469dbf SConfig/Project.py
--- a/SConfig/Project.py	Wed Sep 10 01:18:32 2008 +0000
+++ b/SConfig/Project.py	Thu Oct 09 23:49:12 2008 +1100
@@ -246,8 +246,8 @@ class Project(SConfig.Node):
             self.backup_variable(scons_env, d.keys(), old_state)
             scons_env.MergeFlags(d)
 
-	# Setup the optimisation flags
-        if self.env['with_optimise']:
+        # Setup the optimisation flags
+        if self.env['with_optimise'] and not self.env['with_debug']:
             d = scons_env.ParseFlags('-O3')
             self.backup_variable(scons_env, d.keys(), old_state)
             scons_env.MergeFlags(d)