set TRACING_ON one way or another explicitly in the

SConscript file instead of basing it on DEBUG

--HG--
extra : convert_revision : 6e6807cc4350ef92baeaaabfeb3dc0bb785128ba

diff --git a/src/SConscript b/src/SConscript
index 44bcb5320b6e898cf7241a7563e357e8db9b8d6c..929ed827825f906e27041e88d3d4f7a4f1e1722e 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -316,16 +316,17 @@ else:
 
 makeEnv('debug', '.do',
         CCFLAGS = Split('%s -O0' % debug_flag),
-        CPPDEFINES = 'DEBUG')
+        CPPDEFINES = ['DEBUG', 'TRACING_ON=1'])
 
 # Optimized binary
 makeEnv('opt', '.o',
-        CCFLAGS = Split('-g -O3'))
+        CCFLAGS = Split('-g -O3'),
+        CPPDEFINES = ['TRACING_ON=1'])
 
 # "Fast" binary
 makeEnv('fast', '.fo', strip = True,
         CCFLAGS = Split('-O3'),
-        CPPDEFINES = 'NDEBUG')
+        CPPDEFINES = ['NDEBUG', 'TRACING_ON=0'])
 
 # Profiled binary
 makeEnv('prof', '.po',

diff --git a/src/base/trace.hh b/src/base/trace.hh
index 8df5dd893e988a2b0c25dbffd0f7529fc9242750..9b053990cdd91b5a5fb30dc733d24132514169f0 100644 (file)
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -39,14 +39,6 @@
 #include "sim/host.hh"
 #include "sim/root.hh"
 
-#ifndef TRACING_ON
-#ifndef NDEBUG
-#define TRACING_ON     1
-#else
-#define TRACING_ON     0
-#endif
-#endif
-
 #include "base/traceflags.hh"
 
 namespace Trace {