From 8349c95fc98beb4008085942a67a57f0c4da074b Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Fri, 18 Nov 2022 08:00:19 -0800 Subject: [PATCH] Also collect clang resource directory with `-no-canonical-prefixes` `clang -print-resource-dir` without `-no-canonical-prefixes` returns a different path than is actually used to include `asan_blacklist.txt` on macOS with non-Apple clang. Closes #16730. PiperOrigin-RevId: 489475662 Change-Id: If17f347d76f86e0ec5804f9e8789f44f46ab27b4 --- tools/cpp/unix_cc_configure.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl index c33cadcfb40b80..bfb37bddb4c203 100644 --- a/tools/cpp/unix_cc_configure.bzl +++ b/tools/cpp/unix_cc_configure.bzl @@ -143,7 +143,7 @@ def _get_cxx_include_directories(repository_ctx, cc, lang_flag, additional_flags if _is_compiler_option_supported(repository_ctx, cc, "-print-resource-dir"): resource_dir = repository_ctx.execute( - [cc, "-print-resource-dir"], + [cc, "-print-resource-dir"] + additional_flags, ).stdout.strip() + "/share" inc_directories.append(_prepare_include_path(repository_ctx, resource_dir))