Conversation
Summary of ChangesHello @star-hengxing, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves a reported issue related to how Clang toolchain packages handle dependencies during cross-compilation. By modifying the flag generation logic to explicitly include package dependency information, it ensures that CMake C and C++ flags are correctly configured, leading to more robust and accurate builds when using Clang-based toolchains. Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request aims to fix an issue where package dependency flags were not being passed to CMake when using the clang toolchain on Windows. The change correctly adds the packagedeps to the options for _get_cflags and _get_cxxflags. My review identifies a critical issue where this change could lead to a crash if opt.packagedeps is nil. I have provided a suggestion to fix this and make the code more robust.
| if package:has_tool("cc", "clang", "clang_cl") then | ||
| -- @see https://github.com/xmake-io/xmake-repo/issues/7662 | ||
| platform_envs.CMAKE_C_FLAGS = _get_cflags(package, {cross = true}) | ||
| platform_envs.CMAKE_C_FLAGS = _get_cflags(package, {cross = true, packagedeps = opt.packagedeps}) | ||
| end | ||
| if package:has_tool("cxx", "clang", "clang_cl") then | ||
| platform_envs.CMAKE_CXX_FLAGS = _get_cxxflags(package, {cross = true}) | ||
| platform_envs.CMAKE_CXX_FLAGS = _get_cxxflags(package, {cross = true, packagedeps = opt.packagedeps}) | ||
| end |
There was a problem hiding this comment.
This change correctly passes packagedeps to _get_cflags and _get_cxxflags. However, if opt.packagedeps is nil, it will cause a crash inside _get_cflags_from_packagedeps which calls ipairs(opt.packagedeps). To prevent this, you should ensure packagedeps is always a table.
The suggested change below fixes this potential crash and also refactors the code slightly to avoid creating the options table twice.
A more robust fix would be to add a guard inside _get_cflags_from_packagedeps (e.g., for _, depname in ipairs(opt.packagedeps or {}) do) to handle all call sites, as this issue might exist in other parts of the code that call _get_cflags or _get_ldflags.
local cflags_opt = {cross = true, packagedeps = opt.packagedeps or {}}
if package:has_tool("cc", "clang", "clang_cl") then
-- @see https://github.com/xmake-io/xmake-repo/issues/7662
platform_envs.CMAKE_C_FLAGS = _get_cflags(package, cflags_opt)
end
if package:has_tool("cxx", "clang", "clang_cl") then
platform_envs.CMAKE_CXX_FLAGS = _get_cxxflags(package, cflags_opt)
end
Fix #6887