Skip to content

[tools] apply local compilation flags to group libraries - #12070

Open
Daiyuanranfeng wants to merge 1 commit into
RT-Thread:masterfrom
Daiyuanranfeng:fix/scons-library-local-flags
Open

Daiyuanranfeng wants to merge 1 commit into
RT-Thread:masterfrom
Daiyuanranfeng:fix/scons-library-local-flags

Conversation

@Daiyuanranfeng

Copy link
Copy Markdown

拉取/合并请求描述:(PR description)

为什么提交这份PR (why to submit this PR)

Fixes #4417. A group declared with LIBRARY=True and local compilation flags can register two different SCons actions for the same object: one through the library builder and another when the application processes local flags.

你的解决方案是什么 (what is your solution)

Build a library group's objects with the same local-flag handling used for ordinary groups, then archive those objects. In the normal application build, do not add those library sources to the separate local-object pass.

请提供验证的bsp和config (provide the config and bsp)

  • BSP: not applicable; host-side SCons build planning.
  • .config: unchanged.
  • action: not run locally. A minimal fixture exercising DefineGroup and DoBuilding with SCons 4.11.1 (scons -Q -n) reproduces the conflicting actions on master. With the fix, the library source compiles once with its global and local defines, the non-library group keeps its local define, and the link command uses the archive. git diff --check passed. No firmware build or hardware test.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

Signed-off-by: Daiyuanranfeng <daiyuanranfeng@openatom.club>
@github-actions

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 fix/scons-library-local-flags
    Enter PR branch fix/scons-library-local-flags in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 fix/scons-library-local-flags 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/scons-library-local-flags branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions github-actions Bot added the tools label Nov 19, 2026

@BernardXiong BernardXiong left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Review / 审查 — 4e82d27e

结论 / Conclusion: COMMENT — 静态审查未发现阻塞问题;CI 尚待运行。

  • LOCAL_* 选项现在统一由 _local_group_objects() 处理,LIBRARY 组在 DefineGroup() 阶段就用本地选项生成对象再归档;DoBuilding() 的两处本地对象收集都跳过 LIBRARY 组,从而消除了同一源文件被 library builder 与本地选项 pass 用不同 action 重复编译的问题(building.py:685-700、building.py:795-800、building.py:903-920)。
  • 非阻塞建议:沿用旧实现的 Env.get(key, ['']) 默认值,在仅设置 LOCAL_CFLAGS 等其他选项时,仍会向 CPPPATH/CPPDEFINES 插入一个空字符串条目;该函数现在也会作用于 LIBRARY 组,建议改为 Env.get(key, []),避免空 include 条目带来的歧义。
  • 首次贡献者:已静态核对唯一改动文件 tools/building.py(未涉及 workflow、依赖或外部下载),并批准了本 head 的 7 个 action_required 工作流;构建结果出来前不给出 APPROVE。

No blocking issue found. One non-blocking suggestion: keep the Env.get(key, []) default instead of [''] to avoid injecting an empty CPPPATH/CPPDEFINES entry.

@github-actions

Copy link
Copy Markdown

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

building: DefineGroup not support LIBRARY with LOCAL FLAGS

2 participants