diff options
| author | Tom Tanner <ttanner2@bloomberg.net> | 2013-10-30 12:33:19 (GMT) |
|---|---|---|
| committer | Tom Tanner <ttanner2@bloomberg.net> | 2013-10-30 12:33:19 (GMT) |
| commit | 7fdab2a7cae767172f4dcea67c3ab4d1a37926e2 (patch) | |
| tree | 005ece6f3e371cee63e68bf070447c245592d6ed /src/engine/SCons/Script/Main.py | |
| parent | 91020237d64f53b2fa6e2b5bf155a1d8bfbdb547 (diff) | |
| parent | e38f59cab5d40f09f15c5e65645aa2d8af165c66 (diff) | |
| download | SCons-7fdab2a7cae767172f4dcea67c3ab4d1a37926e2.zip SCons-7fdab2a7cae767172f4dcea67c3ab4d1a37926e2.tar.gz SCons-7fdab2a7cae767172f4dcea67c3ab4d1a37926e2.tar.bz2 | |
Merged scons/scons into default
Diffstat (limited to 'src/engine/SCons/Script/Main.py')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 1651d1e..6ccfcb7 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -630,7 +630,7 @@ def _set_debug_values(options): debug_values = options.debug if "count" in debug_values: - # All of the object counts are within "if __debug__:" blocks, + # All of the object counts are within "if track_instances:" blocks, # which get stripped when running optimized (with python -O or # from compiled *.pyo files). Provide a warning if __debug__ is # stripped, so it doesn't just look like --debug=count is broken. @@ -638,6 +638,7 @@ def _set_debug_values(options): if __debug__: enable_count = True if enable_count: count_stats.enable(sys.stdout) + SCons.Debug.track_instances = True else: msg = "--debug=count is not supported when running SCons\n" + \ "\twith the python -O option or optimized (.pyo) modules." @@ -652,6 +653,8 @@ def _set_debug_values(options): if "memory" in debug_values: memory_stats.enable(sys.stdout) print_objects = ("objects" in debug_values) + if print_objects: + SCons.Debug.track_instances = True if "presub" in debug_values: SCons.Action.print_actions_presub = 1 if "stacktrace" in debug_values: |