Skip to content

limit get build envs in package configs#7003

Merged
waruqi merged 1 commit intodevfrom
package
Nov 7, 2025
Merged

limit get build envs in package configs#7003
waruqi merged 1 commit intodevfrom
package

Conversation

@waruqi
Copy link
Member

@waruqi waruqi commented Nov 7, 2025

  • Before adding new features and new modules, please go to issues to submit the relevant feature description first.
  • Write good commit messages and use the same coding conventions as the rest of the project.
  • Please commit code to dev branch and we will merge into master branch in feature
  • Ensure your edited codes with four spaces instead of TAB.

  • 增加新特性和新模块之前,请先到issues提交相关特性说明,经过讨论评估确认后,再进行相应的代码提交,避免做无用工作。
  • 编写友好可读的提交信息,并使用与工程代码相同的代码规范,代码请用4个空格字符代替tab缩进。
  • 请提交代码到dev分支,如果通过,我们会在特定时间合并到master分支上。
  • 为了规范化提交日志的格式,commit消息,不要用中文,请用英文描述。

@waruqi waruqi added this to the v3.0.5 milestone Nov 7, 2025
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @waruqi, 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 refines the mechanism for retrieving build environment variables within Xmake's package configuration system. It introduces a more granular control over which configuration values are included, preventing the indiscriminate collection of all available settings and focusing on essential, built-in flags. This enhancement aims to improve the precision and efficiency of build environment setup for packages.

Highlights

  • Refined Build Environment Configuration Retrieval: The build_envs function now selectively retrieves configuration values, specifically limiting the inclusion of self:config(key) to only a predefined set of 'builtin' flags (cflags, cxxflags, ldflags, etc.).
  • Addressed Issue package:add_configs break os.execv #6897: This change directly addresses the issue where get_build_envs was retrieving an overly broad range of configuration values, potentially leading to unintended behavior or performance issues, as reported in issue package:add_configs break os.execv #6897.
Using Gemini Code Assist

The 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 /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

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 .gemini/ folder in the base of the repository. Detailed instructions can be found here.

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

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly limits the retrieval of build environments from package configurations to a predefined set of built-in configurations. The logic change is sound and addresses the intended issue. I have one suggestion to improve the readability of the new code block by using distinct variable names instead of reusing the value variable, which would make the code easier to understand and maintain.

Comment on lines 1254 to +1272
local value = config.get(key)
if value == nil then
value = self:tool(key)
end
value = table.unique(table.join(table.wrap(value), table.wrap(self:config(key)), self:toolconfig(key)))
if #value > 0 then
value = table.unwrap(value)
rawset(tbl, key, value)
return value
if value then
table.join2(result, value)
end
-- we can only get the builtin config values
-- https://github.com/xmake-io/xmake/issues/6897
if builtin_configs:has(key) then
value = self:config(key)
if value then
table.join2(result, value)
end
end
value = self:toolconfig(key)
if value then
table.join2(result, value)
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The logic here is correct, but the repeated reuse of the value variable for different purposes (config.get, self:tool, self:config, self:toolconfig) makes the code a bit hard to follow. Using distinct variable names for each value source would improve readability and maintainability.

            local value = config.get(key) or self:tool(key)
            if value then
                table.join2(result, value)
            end
            -- we can only get the builtin config values
            -- https://github.com/xmake-io/xmake/issues/6897
            if builtin_configs:has(key) then
                local config_value = self:config(key)
                if config_value then
                    table.join2(result, config_value)
                end
            end
            local toolconfig_value = self:toolconfig(key)
            if toolconfig_value then
                table.join2(result, toolconfig_value)
            end

@waruqi waruqi merged commit 0b91f56 into dev Nov 7, 2025
44 checks passed
@waruqi waruqi deleted the package branch November 7, 2025 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant