Skip to content

Commit 58bb42a

Browse files
keithcopybara-github
authored andcommitted
Revert "Switch to -fdebug-compilation-dir"
This reverts commit 0cb8757. This flag isn't supported by Xcode 11.2, which is the newest available version for macOS 10.14 #12354 (comment) Fixes #12905 Closes #12882. PiperOrigin-RevId: 355126529
1 parent 28fc8a1 commit 58bb42a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

tools/osx/crosstool/cc_toolchain_config.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5400,7 +5400,7 @@ def _impl(ctx):
54005400
ACTION_NAMES.objc_compile,
54015401
ACTION_NAMES.objcpp_compile,
54025402
],
5403-
flag_groups = [flag_group(flags = ["-fdebug-compilation-dir", "."])],
5403+
flag_groups = [flag_group(flags = ["DEBUG_PREFIX_MAP_PWD=."])],
54045404
),
54055405
],
54065406
)

tools/osx/crosstool/wrapped_clang.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ void ProcessArgument(const std::string arg, const std::string developer_dir,
318318
}
319319

320320
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+
}
321324
if (arg.compare("OSO_PREFIX_MAP_PWD") == 0) {
322325
new_arg = "-Wl,-oso_prefix," + cwd + "/";
323326
}

0 commit comments

Comments
 (0)