commit 0cb8757781e3ab9b4aee06483b74b46a2e4c6126
author Keith Smiley <keithbsmiley@gmail.com> Wed Nov 11 08:16:54 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 11 08:18:05 2020 -0800
tree ad3194a30fac0dae4978b7dddcd1cb9609032e63
parent 1c40d1483e5887790996ba931360bc2cef6389db

Switch to -fdebug-compilation-dir

This removes some argument parsing from wrapped_clang. This flag was
introduced in clang 9.

Closes #12354.

PiperOrigin-RevId: 341833675

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 a331804..73f5850 100644
--- a/tools/osx/crosstool/cc_toolchain_config.bzl
+++ b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -5371,7 +5371,7 @@
                     ACTION_NAMES.objc_compile,
                     ACTION_NAMES.objcpp_compile,
                 ],
-                flag_groups = [flag_group(flags = ["DEBUG_PREFIX_MAP_PWD=."])],
+                flag_groups = [flag_group(flags = ["-fdebug-compilation-dir", "."])],
             ),
         ],
     )

tools/osx/crosstool/wrapped_clang.cc

diff --git a/tools/osx/crosstool/wrapped_clang.cc b/tools/osx/crosstool/wrapped_clang.cc
index 4463540..2f2bbbe 100644
--- a/tools/osx/crosstool/wrapped_clang.cc
+++ b/tools/osx/crosstool/wrapped_clang.cc
@@ -217,9 +217,6 @@
       std::ofstream bitcode_symbol_map_file(bitcode_symbol_map);
       arg = bitcode_symbol_map;
     }
-    if (SetArgIfFlagPresent(arg, "DEBUG_PREFIX_MAP_PWD", &dest_dir)) {
-      arg = "-fdebug-prefix-map=" + std::string(cwd.get()) + "=" + dest_dir;
-    }
     if (arg.compare("OSO_PREFIX_MAP_PWD") == 0) {
       arg = "-Wl,-oso_prefix," + std::string(cwd.get()) + "/";
     }