Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b27fca71
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,发现更多精彩内容 >>
提交
b27fca71
编写于
9月 07, 2020
作者:
V
Vadim Petrochenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rustbuild: Deduplicate LLD checks slightly
上级
5118a51b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
10 deletion
+13
-10
src/bootstrap/builder.rs
src/bootstrap/builder.rs
+3
-4
src/bootstrap/lib.rs
src/bootstrap/lib.rs
+7
-3
src/bootstrap/test.rs
src/bootstrap/test.rs
+3
-3
未找到文件。
src/bootstrap/builder.rs
浏览文件 @
b27fca71
...
...
@@ -758,7 +758,7 @@ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
if
let
Some
(
linker
)
=
self
.linker
(
compiler
.host
)
{
cmd
.env
(
"RUSTDOC_LINKER"
,
linker
);
}
if
self
.
config.use_lld
&&
!
compiler
.host
.contains
(
"msvc"
)
{
if
self
.
is_fuse_ld_lld
(
compiler
.host
)
{
cmd
.env
(
"RUSTDOC_FUSE_LD_LLD"
,
"1"
);
}
cmd
...
...
@@ -1047,7 +1047,7 @@ pub fn cargo(
if
let
Some
(
host_linker
)
=
self
.linker
(
compiler
.host
)
{
cargo
.env
(
"RUSTC_HOST_LINKER"
,
host_linker
);
}
if
self
.
config.use_lld
&&
!
compiler
.host
.contains
(
"msvc"
)
{
if
self
.
is_fuse_ld_lld
(
compiler
.host
)
{
cargo
.env
(
"RUSTC_HOST_FUSE_LD_LLD"
,
"1"
);
}
...
...
@@ -1055,8 +1055,7 @@ pub fn cargo(
let
target
=
crate
::
envify
(
&
target
.triple
);
cargo
.env
(
&
format!
(
"CARGO_TARGET_{}_LINKER"
,
target
),
target_linker
);
}
if
self
.config.use_lld
&&
!
target
.contains
(
"msvc"
)
{
if
self
.is_fuse_ld_lld
(
target
)
{
rustflags
.arg
(
"-Clink-args=-fuse-ld=lld"
);
}
...
...
src/bootstrap/lib.rs
浏览文件 @
b27fca71
...
...
@@ -863,15 +863,19 @@ fn linker(&self, target: TargetSelection) -> Option<&Path> {
&&
!
target
.contains
(
"msvc"
)
{
Some
(
self
.cc
(
target
))
}
else
if
target
.contains
(
"msvc"
)
&&
self
.config.use_lld
&&
self
.build
==
target
{
// `rust.use_lld` means using LLD directly only for MSVC, for other targets it only
// adds `-fuse-ld=lld` to already selected linker.
}
else
if
self
.config.use_lld
&&
!
self
.is_fuse_ld_lld
(
target
)
&&
self
.build
==
target
{
Some
(
&
self
.initial_lld
)
}
else
{
None
}
}
// LLD is used through `-fuse-ld=lld` rather than directly.
// Only MSVC targets use LLD directly at the moment.
fn
is_fuse_ld_lld
(
&
self
,
target
:
TargetSelection
)
->
bool
{
self
.config.use_lld
&&
!
target
.contains
(
"msvc"
)
}
/// 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
浏览文件 @
b27fca71
...
...
@@ -603,7 +603,7 @@ fn run(self, builder: &Builder<'_>) {
if
let
Some
(
linker
)
=
builder
.linker
(
self
.compiler.host
)
{
cmd
.env
(
"RUSTDOC_LINKER"
,
linker
);
}
if
builder
.
config.use_lld
&&
!
self
.compiler.host
.contains
(
"msvc"
)
{
if
builder
.
is_fuse_ld_lld
(
self
.compiler.host
)
{
cmd
.env
(
"RUSTDOC_FUSE_LD_LLD"
,
"1"
);
}
try_run
(
builder
,
&
mut
cmd
);
...
...
@@ -1070,14 +1070,14 @@ fn run(self, builder: &Builder<'_>) {
let
mut
hostflags
=
flags
.clone
();
hostflags
.push
(
format!
(
"-Lnative={}"
,
builder
.test_helpers_out
(
compiler
.host
)
.display
()));
if
builder
.
config.use_lld
&&
!
compiler
.host.triple
.contains
(
"msvc"
)
{
if
builder
.
is_fuse_ld_lld
(
compiler
.host
)
{
hostflags
.push
(
"-Clink-args=-fuse-ld=lld"
.to_string
());
}
cmd
.arg
(
"--host-rustcflags"
)
.arg
(
hostflags
.join
(
" "
));
let
mut
targetflags
=
flags
;
targetflags
.push
(
format!
(
"-Lnative={}"
,
builder
.test_helpers_out
(
target
)
.display
()));
if
builder
.
config.use_lld
&&
!
target
.contains
(
"msvc"
)
{
if
builder
.
is_fuse_ld_lld
(
target
)
{
targetflags
.push
(
"-Clink-args=-fuse-ld=lld"
.to_string
());
}
cmd
.arg
(
"--target-rustcflags"
)
.arg
(
targetflags
.join
(
" "
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录