Fix clang-scan-deps PATH lookup and lld detection on macOS#563
Open
srikantharun wants to merge 1 commit intobazelbuild:mainfrom
Open
Fix clang-scan-deps PATH lookup and lld detection on macOS#563srikantharun wants to merge 1 commit intobazelbuild:mainfrom
srikantharun wants to merge 1 commit intobazelbuild:mainfrom
Conversation
This commit fixes two issues: 1. clang-scan-deps PATH lookup (fixes bazelbuild#553) - Previously, clang-scan-deps path was hardcoded by assuming it's in the same directory as the compiler - Now uses PATH lookup via `which()` first, with fallback to the compiler directory for backward compatibility 2. lld path detection on macOS (fixes bazelbuild#499) - Previously, _find_linker_path() used the last quoted path line from stderr, which breaks when lld emits warnings after the invocation - Now looks for the specific linker invocation line by matching linker patterns (ld.lld, ld64.lld, ld.gold, gold)
Collaborator
|
Can you rebase and merge your PR? I think the LLD changes have already been addressed in #516 but the clang-scan-deps fixes might still be valuable. cc: @PikachuHyA @fmeum |
PikachuHyA
reviewed
Mar 9, 2026
| path_arr = cc_str.split("/")[:-1] | ||
| path_arr.append("clang-scan-deps") | ||
| deps_scanner = "/".join(path_arr) | ||
| # Find clang-scan-deps via PATH lookup instead of assuming it's in the |
Contributor
There was a problem hiding this comment.
I’d prefer to look for clang-scan-deps in the same directory first, and only fall back to searching in PATH if it isn’t found. The reason is that I want to ensure, as much as possible, that clang and clang-scan-deps are from the same version.
Would this change break your workflow?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR fixes two related toolchain configuration issues:
1. clang-scan-deps PATH lookup (fixes #553)
Problem:
clang-scan-depspath was hardcoded by assuming it's in the same directory as the compiler:Solution: Use PATH lookup via
which()first, with fallback to the compiler directory for backward compatibility.2. lld path detection on macOS (fixes #499)
Problem:
_find_linker_path()used the last quoted path line from stderr:When lld emits warnings (e.g.,
ld64.lld: warning: directory not found for option -L/usr/local/lib), the warning appears after the linker invocation, causing the detection to fail.Solution: Look for the specific linker invocation line by matching linker patterns (
ld.lld,ld64.lld,ld.gold,gold) instead of blindly using the last line.Test plan