Fix libc++.modules.json finding #4695
Merged
Conversation
This file contains 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
waruqi
reviewed
Feb 5, 2024
| @@ -209,7 +209,7 @@ function get_stdmodules(target) | |||
| -- @see https://github.com/llvm/llvm-project/pull/76451 (has been revert, so we need to wait) | |||
| local clang_path = path.directory(get_clang_path(target)) | |||
| local clang_lib_path = path.join(clang_path, "..", "lib") | |||
| local modules_json_path = find_file("libc++.modules.json", clang_lib_path) | |||
| local modules_json_path = find_file("**.modules.json", clang_lib_path) | |||
There was a problem hiding this comment.
why not use -print-library-module-manifest-path?
def print_std_module_manifest_path : Flag<["-", "--"], "print-library-module-manifest-path">,
HelpText<"Print the path for the C++ Standard library module manifest">,
Visibility<[ClangOption, CLOption]>;
There was a problem hiding this comment.
It looks like it might also be modules-asan.json
// For example
// StringRef modules = [&] {
// const SanitizerArgs &Sanitize = TC.getSanitizerArgs(C.getArgs());
// if (Sanitize.needsAsanRt())
// return "modules-asan.json";
// return "modules.json";
// }();
There was a problem hiding this comment.
why not use
-print-library-module-manifest-path?def print_std_module_manifest_path : Flag<["-", "--"], "print-library-module-manifest-path">, HelpText<"Print the path for the C++ Standard library module manifest">, Visibility<[ClangOption, CLOption]>;
it has been reverted, i plan to support it when it's re-merged
llvm/llvm-project@82f424f
|
ok |
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.
when libc++.modules.json is in subdir of lib folder, it fail to find it (for example on debian platform)