Switch to -fdebug-compilation-dir

This removes some argument parsing from wrapped_clang. This flag was introduced in clang 9. Closes bazelbuild#12354. PiperOrigin-RevId: 341833675
fweikert · Nov 11, 2020 · 0cb8757 · 0cb8757
1 parent 1c40d14
commit 0cb8757
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -5371,7 +5371,7 @@ def _impl(ctx):
                     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", "."])],
             ),
         ],
     )

diff --git a/tools/osx/crosstool/wrapped_clang.cc b/tools/osx/crosstool/wrapped_clang.cc
@@ -217,9 +217,6 @@ int main(int argc, char *argv[]) {
       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()) + "/";
     }