Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
ff33001f
R
Rust
项目概览
int
/
Rust
接近 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ff33001f
编写于
5月 28, 2022
作者:
U
Urgau
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use new cargo argument of cfg checking in bootstrap
上级
bef2b7cd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
20 deletion
+17
-20
src/bootstrap/builder.rs
src/bootstrap/builder.rs
+17
-20
未找到文件。
src/bootstrap/builder.rs
浏览文件 @
ff33001f
...
...
@@ -1355,29 +1355,26 @@ pub fn cargo(
// get some support for setting `--check-cfg` within build script, it's the least invasive
// hack that still let's us have cfg checking for the vast majority of the codebase.
if
stage
!=
0
{
// Enable cfg checking of cargo features for everything but std.
// Enable cfg checking of cargo features for everything but std and also enable cfg
// checking of names and values.
//
// Note: `std`, `alloc` and `core` imports some dependencies by #[path] (like
// backtrace, core_simd, std_float, ...), those dependencies have their own features
// but cargo isn't involved in the #[path] and so cannot pass the complete list of
// features, so for that reason we don't enable checking of features for std.
// backtrace, core_simd, std_float, ...), those dependencies have their own
// features but cargo isn't involved in the #[path] process and so cannot pass the
// complete list of features, so for that reason we don't enable checking of
// features for std crates.
cargo
.arg
(
if
mode
!=
Mode
::
Std
{
"-Zcheck-cfg=names,values,features"
}
else
{
"-Zcheck-cfg=names,values"
});
// Add extra cfg not defined in/by rustc
//
// FIXME: Re-enable this after the beta bump as apperently rustc-perf doesn't use the
// beta cargo. See https://github.com/rust-lang/rust/pull/96984#issuecomment-1126678773
// #[cfg(not(bootstrap))]
// if mode != Mode::Std {
// cargo.arg("-Zcheck-cfg-features"); // -Zcheck-cfg=features after bump
// }
// Enable cfg checking of well known names/values
rustflags
.arg
(
"-Zunstable-options"
)
// Enable checking of well known names
.arg
(
"--check-cfg=names()"
)
// Enable checking of well known values
.arg
(
"--check-cfg=values()"
);
// Add extra cfg not defined in rustc
// Note: Altrough it would seems that "-Zunstable-options" to `rustflags` is useless as
// cargo would implicitly add it, it was discover that sometimes bootstrap only use
// `rustflags` without `cargo` making it required.
rustflags
.arg
(
"-Zunstable-options"
);
for
(
restricted_mode
,
name
,
values
)
in
EXTRA_CHECK_CFGS
{
if
*
restricted_mode
==
None
||
*
restricted_mode
==
Some
(
mode
)
{
// Creating a string of the values by concatenating each value:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录