commit fa69b78ff2ab4138b5ec3fcdeb23ba406f7f8227
author Keith Smiley <keithbsmiley@gmail.com> Thu Oct 07 03:24:13 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 07 03:25:37 2021 -0700
tree c45ed0c3edf67ffec664192353c64ec88fede322
parent 2cdb6470af1a5cca2c1b58f0ae6dbd6a4840310f

Add -g in `per_object_debug_info` for Clang 12 and GCC 11

Applies https://github.com/bazelbuild/rules_cc/pull/115 here

Fixes https://github.com/bazelbuild/bazel/issues/14038

Closes #14084.

PiperOrigin-RevId: 401468526

src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
index 1ee3b02..0610fa0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
@@ -175,6 +175,7 @@
                         "    flag_group {",
                         "      expand_if_all_available: 'per_object_debug_info_file'",
                         "      flag: '-gsplit-dwarf'",
+                        "      flag: '-g'",
                         "    }",
                         "  }")));
       }

src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
index 174cd99..cca9178 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
@@ -7590,7 +7590,7 @@
                 ],
                 flag_groups = [
                     flag_group(
-                        flags = ["-gsplit-dwarf"],
+                        flags = ["-gsplit-dwarf", "-g"],
                         expand_if_available = "per_object_debug_info_file",
                     ),
                 ],

tools/cpp/unix_cc_toolchain_config.bzl

diff --git a/tools/cpp/unix_cc_toolchain_config.bzl b/tools/cpp/unix_cc_toolchain_config.bzl
index 671d626..1d4ee95 100644
--- a/tools/cpp/unix_cc_toolchain_config.bzl
+++ b/tools/cpp/unix_cc_toolchain_config.bzl
@@ -386,7 +386,7 @@
                 ],
                 flag_groups = [
                     flag_group(
-                        flags = ["-gsplit-dwarf"],
+                        flags = ["-gsplit-dwarf", "-g"],
                         expand_if_available = "per_object_debug_info_file",
                     ),
                 ],

tools/osx/crosstool/cc_toolchain_config.bzl

diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl
index ed5265c..f0a8364 100644
--- a/tools/osx/crosstool/cc_toolchain_config.bzl
+++ b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -1674,7 +1674,7 @@
                 ],
                 flag_groups = [
                     flag_group(
-                        flags = ["-gsplit-dwarf"],
+                        flags = ["-gsplit-dwarf", "-g"],
                         expand_if_available = "per_object_debug_info_file",
                     ),
                 ],