Add support for libstdc++ standard library modules #5869
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
A2va
reviewed
Nov 23, 2024
| return nil | ||
| end | ||
|
|
||
| local modules_json = json.decode(io.readfile(modules_json_path)) |
waruqi
reviewed
Nov 23, 2024
| return os.iorunv(compinst:program(), {"-print-file-name=libstdc++.modules.json"}, {envs = compinst:runenvs()}) | ||
| end | ||
| } | ||
| modules_json_path = modules_json_path:trim() |
There was a problem hiding this comment.
modules_json_path maybe nil,
if modules_json_path then
modules_json_path = modules_json_path:trim()
if os.isfile(modules_json_path) then
return modules_json_path
end
end
waruqi
reviewed
Nov 23, 2024
| if not path.is_absolute(module_file_path) then | ||
| module_file_path = path.join(modules_json_dir, module_file_path) | ||
| end | ||
| table.join2(std_module_files, {module_file_path}) |
There was a problem hiding this comment.
table.insert(std_module_files, module_file_path)
|
it will break ci. https://github.com/xmake-io/xmake/actions/runs/12023662331 |
Merged
waruqi
reviewed
Nov 26, 2024
| if target:policy("build.c++.gcc.modules.cxx11abi") then | ||
|
|
||
| -- libstdc++ std modules cannot compile with -D_GLIBCXX_USE_CXX11_ABI=0 | ||
| if target:policy("build.c++.modules.std") or target:policy("build.c++.gcc.modules.cxx11abi") then |
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.
An installed source form of module std and std.compat has been merged into gcc trunk branch. It's time to add support for them.
[Bug 106852](c++lib-std-module) - Implement C++23 P2465R3 Standard Library Modules std and std.compat
GCC provides a
libstdc++.modules.jsonfile alongsidelibstdc++.so, which tells the build system where the files are. We can also find this file with :Content in the json may looks like this:
{ "version": 1, "revision": 1, "modules": [ { "logical-name": "std", "source-path": "../include/c++/15/bits/std.cc", "is-std-library": true }, { "logical-name": "std.compat", "source-path": "../include/c++/15/bits/std.compat.cc", "is-std-library": true } ] }The structure of this json file is basicly the same as the one provided by llvm.
Known issue
Currently, these two files cannot compile with
-D_GLIBCXX_USE_CXX11_ABI=0option, so I set ths macro to1if a target is compile with std modules. This issue may related to #2716 and #3855 .