Repository navigation
[tools] apply local compilation flags to group libraries - #12070
Daiyuanranfeng wants to merge 1 commit into
Conversation
Signed-off-by: Daiyuanranfeng <daiyuanranfeng@openatom.club>
|
👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。 🛠 操作步骤 | Steps
完成后,提交将自动更新至 如有问题欢迎联系我们,再次感谢您的贡献!💐 |
BernardXiong
left a comment
There was a problem hiding this comment.
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.
|
拉取/合并请求描述:(PR description)
为什么提交这份PR (why to submit this PR)
Fixes #4417. A group declared with
LIBRARY=Trueand 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)
DefineGroupandDoBuildingwith 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 --checkpassed. No firmware build or hardware test.当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up