Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
0ddc3afb
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,发现更多精彩内容 >>
提交
0ddc3afb
编写于
6月 07, 2021
作者:
T
The8472
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build doctests with lld if use-lld = true
上级
2312ff1a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
16 deletion
+27
-16
src/bootstrap/bin/rustdoc.rs
src/bootstrap/bin/rustdoc.rs
+6
-1
src/bootstrap/builder.rs
src/bootstrap/builder.rs
+4
-0
src/bootstrap/lib.rs
src/bootstrap/lib.rs
+15
-0
src/bootstrap/test.rs
src/bootstrap/test.rs
+2
-15
未找到文件。
src/bootstrap/bin/rustdoc.rs
浏览文件 @
0ddc3afb
...
...
@@ -41,7 +41,12 @@ fn main() {
cmd
.arg
(
arg
);
}
if
env
::
var_os
(
"RUSTDOC_FUSE_LD_LLD"
)
.is_some
()
{
cmd
.arg
(
"-Clink-args=-fuse-ld=lld"
);
cmd
.arg
(
"-Clink-arg=-fuse-ld=lld"
);
if
cfg!
(
windows
)
{
cmd
.arg
(
"-Clink-arg=-Wl,/threads:1"
);
}
else
{
cmd
.arg
(
"-Clink-arg=-Wl,--threads=1"
);
}
}
// Needed to be able to run all rustdoc tests.
...
...
src/bootstrap/builder.rs
浏览文件 @
0ddc3afb
...
...
@@ -1142,6 +1142,7 @@ pub fn cargo(
}
if
self
.is_fuse_ld_lld
(
compiler
.host
)
{
cargo
.env
(
"RUSTC_HOST_FUSE_LD_LLD"
,
"1"
);
cargo
.env
(
"RUSTDOC_FUSE_LD_LLD"
,
"1"
);
}
if
let
Some
(
target_linker
)
=
self
.linker
(
target
)
{
...
...
@@ -1151,6 +1152,9 @@ pub fn cargo(
if
self
.is_fuse_ld_lld
(
target
)
{
rustflags
.arg
(
"-Clink-args=-fuse-ld=lld"
);
}
self
.lld_flags
(
target
)
.for_each
(|
flag
|
{
rustdocflags
.arg
(
&
flag
);
});
if
!
([
"build"
,
"check"
,
"clippy"
,
"fix"
,
"rustc"
]
.contains
(
&
cmd
))
&&
want_rustdoc
{
cargo
.env
(
"RUSTDOC_LIBDIR"
,
self
.rustc_libdir
(
compiler
));
...
...
src/bootstrap/lib.rs
浏览文件 @
0ddc3afb
...
...
@@ -923,6 +923,21 @@ fn is_fuse_ld_lld(&self, target: TargetSelection) -> bool {
self
.config.use_lld
&&
!
target
.contains
(
"msvc"
)
}
fn
lld_flags
(
&
self
,
target
:
TargetSelection
)
->
impl
Iterator
<
Item
=
String
>
{
let
mut
options
=
[
None
,
None
];
if
self
.config.use_lld
{
if
self
.is_fuse_ld_lld
(
target
)
{
options
[
0
]
=
Some
(
"-Clink-arg=-fuse-ld=lld"
.to_string
());
}
let
threads
=
if
target
.contains
(
"windows"
)
{
"/threads:1"
}
else
{
"--threads=1"
};
options
[
1
]
=
Some
(
format!
(
"-Clink-arg=-Wl,{}"
,
threads
));
}
std
::
array
::
IntoIter
::
new
(
options
)
.flatten
()
}
/// Returns if this target should statically link the C runtime, if specified
fn
crt_static
(
&
self
,
target
:
TargetSelection
)
->
Option
<
bool
>
{
if
target
.contains
(
"pc-windows-msvc"
)
{
...
...
src/bootstrap/test.rs
浏览文件 @
0ddc3afb
...
...
@@ -1131,19 +1131,6 @@ struct Compiletest {
compare_mode
:
Option
<&
'static
str
>
,
}
impl
Compiletest
{
fn
add_lld_flags
(
builder
:
&
Builder
<
'_
>
,
target
:
TargetSelection
,
flags
:
&
mut
Vec
<
String
>
)
{
if
builder
.config.use_lld
{
if
builder
.is_fuse_ld_lld
(
target
)
{
flags
.push
(
"-Clink-arg=-fuse-ld=lld"
.to_string
());
}
let
threads
=
if
target
.contains
(
"windows"
)
{
"/threads:1"
}
else
{
"--threads=1"
};
flags
.push
(
format!
(
"-Clink-arg=-Wl,{}"
,
threads
));
}
}
}
impl
Step
for
Compiletest
{
type
Output
=
();
...
...
@@ -1289,12 +1276,12 @@ fn run(self, builder: &Builder<'_>) {
let
mut
hostflags
=
flags
.clone
();
hostflags
.push
(
format!
(
"-Lnative={}"
,
builder
.test_helpers_out
(
compiler
.host
)
.display
()));
Self
::
add_lld_flags
(
builder
,
compiler
.host
,
&
mut
hostflags
);
hostflags
.extend
(
builder
.lld_flags
(
compiler
.host
)
);
cmd
.arg
(
"--host-rustcflags"
)
.arg
(
hostflags
.join
(
" "
));
let
mut
targetflags
=
flags
;
targetflags
.push
(
format!
(
"-Lnative={}"
,
builder
.test_helpers_out
(
target
)
.display
()));
Self
::
add_lld_flags
(
builder
,
target
,
&
mut
targetflags
);
targetflags
.extend
(
builder
.lld_flags
(
target
)
);
cmd
.arg
(
"--target-rustcflags"
)
.arg
(
targetflags
.join
(
" "
));
cmd
.arg
(
"--docck-python"
)
.arg
(
builder
.python
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录