Revert "Switch to -fdebug-compilation-dir"

keith · copybara-github · commit 58bb42ad7ca2 · 2021-02-02T02:45:49.000-08:00
This reverts commit 0cb8757. This flag isn't supported by Xcode 11.2, which is the newest available version for macOS 10.14 bazelbuild#12354 (comment) Fixes bazelbuild#12905 Closes bazelbuild#12882. PiperOrigin-RevId: 355126529
diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -5400,7 +5400,7 @@ def _impl(ctx):
                     ACTION_NAMES.objc_compile,
                     ACTION_NAMES.objcpp_compile,
                 ],
-                flag_groups = [flag_group(flags = ["-fdebug-compilation-dir", "."])],
+                flag_groups = [flag_group(flags = ["DEBUG_PREFIX_MAP_PWD=."])],
             ),
         ],
     )
diff --git a/tools/osx/crosstool/wrapped_clang.cc b/tools/osx/crosstool/wrapped_clang.cc
@@ -318,6 +318,9 @@ void ProcessArgument(const std::string arg, const std::string developer_dir,
   }
 
   std::string dest_dir, bitcode_symbol_map;
+  if (SetArgIfFlagPresent(arg, "DEBUG_PREFIX_MAP_PWD", &dest_dir)) {
+    new_arg = "-fdebug-prefix-map=" + cwd + "=" + dest_dir;
+  }
   if (arg.compare("OSO_PREFIX_MAP_PWD") == 0) {
     new_arg = "-Wl,-oso_prefix," + cwd + "/";
   }

Original file line number	Diff line number	Diff line change
`@@ -5400,7 +5400,7 @@ def _impl(ctx):`
`5400`	`5400`	`ACTION_NAMES.objc_compile,`
`5401`	`5401`	`ACTION_NAMES.objcpp_compile,`
`5402`	`5402`	`],`
`5403`		`- flag_groups = [flag_group(flags = ["-fdebug-compilation-dir", "."])],`
	`5403`	`+ flag_groups = [flag_group(flags = ["DEBUG_PREFIX_MAP_PWD=."])],`
`5404`	`5404`	`),`
`5405`	`5405`	`],`
`5406`	`5406`	`)`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,9 @@ void ProcessArgument(const std::string arg, const std::string developer_dir,`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`std::string dest_dir, bitcode_symbol_map;`
	`321`	`+ if (SetArgIfFlagPresent(arg, "DEBUG_PREFIX_MAP_PWD", &dest_dir)) {`
	`322`	`+ new_arg = "-fdebug-prefix-map=" + cwd + "=" + dest_dir;`
	`323`	`+ }`
`321`	`324`	`if (arg.compare("OSO_PREFIX_MAP_PWD") == 0) {`
`322`	`325`	`new_arg = "-Wl,-oso_prefix," + cwd + "/";`
`323`	`326`	`}`