Include debug info in all binaries

Change-Id: I9ffd1aa5a66373279aa3b6a619f2b0b58a8818d5
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 548f82b..568cc30 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -3,6 +3,9 @@
 # Don't switch HOST compilers.
 build --host_crosstool_top=//tools/cpp:toolchain
 
+# Always include debug information in the non-.stripped binaries.
+build --strip=never
+
 # Show paths to a few more than just 1 target.
 build --show_result 15
 # Dump the output of the failing test to stdout.
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index cc8d106..57a6ced 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -262,12 +262,6 @@
   compilation_mode_flags {
     mode: OPT
 
-    # No debug symbols.
-    # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or
-    # even generally? However, that can't happen here, as it requires special
-    # handling in Bazel.
-    compiler_flag: "-g0"
-
     compiler_flag: "-O2"
 
     # Disable assertions
@@ -523,12 +517,6 @@
   compilation_mode_flags {
     mode: OPT
 
-    # No debug symbols.
-    # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or
-    # even generally? However, that can't happen here, as it requires special
-    # handling in Bazel.
-    compiler_flag: "-g0"
-
     compiler_flag: "-O2"
 
     # Disable assertions