diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index d159e5d..d76637c 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -255,11 +255,9 @@
   linker_flag: "-Wl,--warn-execstack"
   linker_flag: "-Wl,--detect-odr-violations"
 
-  compilation_mode_flags {
-    mode: DBG
-    # Enable debug symbols.
-    compiler_flag: "-ggdb3"
-  }
+  # Enable debug symbols.
+  compiler_flag: "-ggdb3"
+
   compilation_mode_flags {
     mode: OPT
 
@@ -508,11 +506,9 @@
   #linker_flag: "-Wl,--warn-execstack"
   #linker_flag: "-Wl,--detect-odr-violations"
 
-  compilation_mode_flags {
-    mode: DBG
-    # Enable debug symbols.
-    compiler_flag: "-ggdb3"
-  }
+  # Enable debug symbols.
+  compiler_flag: "-ggdb3"
+
   compilation_mode_flags {
     mode: OPT